Commit e705c121 authored Nov 17, 2015 by Kalle Valo

iwlwifi: move under intel vendor directory



Part of reorganising wireless drivers directory and Kconfig.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent 7ac9a364

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -5651,7 +5651,7 @@ L: linux-wireless@vger.kernel.org
		W: http://intellinuxwireless.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
		S: Supported
		F: drivers/net/wireless/iwlwifi/
		F: drivers/net/wireless/intel/iwlwifi/

		INTEL MANAGEMENT ENGINE (mei)
		M: Tomas Winkler <tomas.winkler@intel.com>

drivers/net/wireless/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,6 @@ config MWL8K

		source "drivers/net/wireless/ath/Kconfig"
		source "drivers/net/wireless/hostap/Kconfig"
		source "drivers/net/wireless/iwlwifi/Kconfig"
		source "drivers/net/wireless/libertas/Kconfig"
		source "drivers/net/wireless/orinoco/Kconfig"
		source "drivers/net/wireless/p54/Kconfig"

drivers/net/wireless/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/

		obj-$(CONFIG_MWL8K) += mwl8k.o

		obj-$(CONFIG_IWLWIFI) += iwlwifi/
		obj-$(CONFIG_RT2X00) += rt2x00/

		obj-$(CONFIG_WL_MEDIATEK) += mediatek/

drivers/net/wireless/intel/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,5 +13,6 @@ if WLAN_VENDOR_INTEL

		source "drivers/net/wireless/intel/ipw2x00/Kconfig"
		source "drivers/net/wireless/intel/iwlegacy/Kconfig"
		source "drivers/net/wireless/intel/iwlwifi/Kconfig"

		endif # WLAN_VENDOR_INTEL

drivers/net/wireless/intel/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,3 +2,5 @@ obj-$(CONFIG_IPW2100) += ipw2x00/
		obj-$(CONFIG_IPW2200) += ipw2x00/

		obj-$(CONFIG_IWLEGACY) += iwlegacy/

		obj-$(CONFIG_IWLWIFI) += iwlwifi/