Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b87e573 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents fdb184d1 9a6f7347

drivers/bcma/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -67,8 +67,7 @@ config BCMA_DRIVER_GMAC_CMN 


config BCMA_DRIVER_GPIO

	bool "BCMA GPIO driver"

	depends on BCMA

	select GPIOLIB

	depends on BCMA && GPIOLIB

	help

	  Driver to provide access to the GPIO pins of the bcma bus.

drivers/bcma/driver_chipcommon_sflash.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = { 
	{ "M25P40", 0x12, 0x10000, 8, },



	{ "M25P16", 0x14, 0x10000, 32, },

	{ "M25P32", 0x14, 0x10000, 64, },

	{ "M25P32", 0x15, 0x10000, 64, },

	{ "M25P64", 0x16, 0x10000, 128, },

	{ "M25FL128", 0x17, 0x10000, 256, },

	{ 0 },

drivers/net/wireless/ath/ath9k/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config ATH9K_HW 
	tristate

config ATH9K_COMMON

	tristate

	select ATH_COMMON

config ATH9K_DFS_DEBUGFS

	def_bool y

	depends on ATH9K_DEBUGFS && ATH9K_DFS_CERTIFIED
@@ -17,7 +18,6 @@ config ATH9K_BTCOEX_SUPPORT 
config ATH9K

	tristate "Atheros 802.11n wireless cards support"

	depends on MAC80211

	select ATH_COMMON

	select ATH9K_HW

	select MAC80211_LEDS

	select LEDS_CLASS
@@ -56,7 +56,8 @@ config ATH9K_AHB 


config ATH9K_DEBUGFS

	bool "Atheros ath9k debugging"

	depends on ATH9K && DEBUG_FS

	depends on ATH9K

	select MAC80211_DEBUGFS

	---help---

	  Say Y, if you need access to ath9k's statistics for

	  interrupts, rate control, etc.

drivers/net/wireless/ath/ath9k/ar9003_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static void ar9003_rx_gain_table_mode0(struct ath_hw *ah) 
				ar9340Common_rx_gain_table_1p0);

	else if (AR_SREV_9485_11(ah))

		INIT_INI_ARRAY(&ah->iniModesRxGain,

				ar9485Common_wo_xlna_rx_gain_1_1);

			       ar9485_common_rx_gain_1_1);

	else if (AR_SREV_9550(ah)) {

		INIT_INI_ARRAY(&ah->iniModesRxGain,

				ar955x_1p0_common_rx_gain_table);

drivers/net/wireless/ath/carl9170/fw.c

+5 −1
Original line number Diff line number Diff line
@@ -336,8 +336,12 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len) 
		if (SUPP(CARL9170FW_WLANTX_CAB)) {

			if_comb_types |=

				BIT(NL80211_IFTYPE_AP) |

				BIT(NL80211_IFTYPE_MESH_POINT) |

				BIT(NL80211_IFTYPE_P2P_GO);



#ifdef CONFIG_MAC80211_MESH

			if_comb_types |=

				BIT(NL80211_IFTYPE_MESH_POINT);

#endif /* CONFIG_MAC80211_MESH */

		}

	}