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

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents 3d5c2032 25b9ea5c

drivers/net/wireless/iwlwifi/Kconfig

+10 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,6 @@ config IWLWIFI 
	select LEDS_CLASS

	select LEDS_CLASS

	select LEDS_TRIGGERS

	select LEDS_TRIGGERS

	select MAC80211_LEDS

	select MAC80211_LEDS

	select IWLDVM

	---help---

	---help---

	  Select to build the driver supporting the:

	  Select to build the driver supporting the:
@@ -45,6 +44,7 @@ config IWLWIFI 
config IWLDVM

config IWLDVM

	tristate "Intel Wireless WiFi DVM Firmware support"

	tristate "Intel Wireless WiFi DVM Firmware support"

	depends on IWLWIFI

	depends on IWLWIFI

	default IWLWIFI

	help

	help

	  This is the driver supporting the DVM firmware which is

	  This is the driver supporting the DVM firmware which is

	  currently the only firmware available for existing devices.

	  currently the only firmware available for existing devices.
@@ -58,6 +58,15 @@ config IWLMVM 




	  Say yes if you have such a device.

	  Say yes if you have such a device.





# don't call it _MODULE -- will confuse Kconfig/fixdep/...

config IWLWIFI_OPMODE_MODULAR

	bool

	default y if IWLDVM=m

	default y if IWLMVM=m



comment "WARNING: iwlwifi is useless without IWLDVM or IWLMVM"

	depends on IWLWIFI && IWLDVM=n && IWLMVM=n



menu "Debugging Options"

menu "Debugging Options"

	depends on IWLWIFI

	depends on IWLWIFI

drivers/net/wireless/iwlwifi/Makefile

+1 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,7 @@ iwlwifi-objs += iwl-notif-wait.o 
iwlwifi-objs		+= iwl-eeprom-read.o iwl-eeprom-parse.o

iwlwifi-objs		+= iwl-eeprom-read.o iwl-eeprom-parse.o

iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o

iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o

iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o

iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o

iwlwifi-objs		+= pcie/1000.o pcie/2000.o pcie/5000.o pcie/6000.o

iwlwifi-objs		+= iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o iwl-7000.o

iwlwifi-objs		+= pcie/7000.o





iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o

iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o

iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-test.o

iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-test.o

drivers/net/wireless/iwlwifi/dvm/agn.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * USA

 * USA

 *

 *

 * The full GNU General Public License is included in this distribution

 * The full GNU General Public License is included in this distribution

 * in the file called LICENSE.GPL.

 * in the file called COPYING.

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 *  Intel Linux Wireless <ilw@linux.intel.com>

drivers/net/wireless/iwlwifi/dvm/calib.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * USA

 * USA

 *

 *

 * The full GNU General Public License is included in this distribution

 * The full GNU General Public License is included in this distribution

 * in the file called LICENSE.GPL.

 * in the file called COPYING.

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 *  Intel Linux Wireless <ilw@linux.intel.com>

drivers/net/wireless/iwlwifi/dvm/calib.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * USA

 * USA

 *

 *

 * The full GNU General Public License is included in this distribution

 * The full GNU General Public License is included in this distribution

 * in the file called LICENSE.GPL.

 * in the file called COPYING.

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 *  Intel Linux Wireless <ilw@linux.intel.com>