aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-06-20 15:03:28 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-06-20 15:03:28 +0000
commit07757044bf158d7a7c25ae7e4273a3ac5e316587 (patch)
treec88363602a9d813f4ab4769d29d4e5942901acb6
parentb954cfdf6a67b3effdaac2c58494e68aad4f0e0a (diff)
downloadupstream-07757044bf158d7a7c25ae7e4273a3ac5e316587.tar.gz
upstream-07757044bf158d7a7c25ae7e4273a3ac5e316587.tar.bz2
upstream-07757044bf158d7a7c25ae7e4273a3ac5e316587.zip
mac80211: add rt2x00-mmio package to store the common parts for SoC and PCI access
This should fix a build error on ramips. SVN-Revision: 36978
-rw-r--r--package/mac80211/Makefile24
1 files changed, 16 insertions, 8 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 4bd6488ab1..4d9d95cd2f 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -229,14 +229,20 @@ define KernelPackage/rt2x00-lib/config
endif
endef
-define KernelPackage/rt2x00-pci
+define KernelPackage/rt2x00-mmio
$(call KernelPackage/rt2x00/Default)
DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +kmod-eeprom-93cx6
+ TITLE+= (MMIO)
+ FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00mmio.ko
+ AUTOLOAD:=$(call AutoLoad,25,rt2x00mmio)
+endef
+
+define KernelPackage/rt2x00-pci
+$(call KernelPackage/rt2x00/Default)
+ DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-mmio +kmod-rt2x00-lib
TITLE+= (PCI)
- FILES:= \
- $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00pci.ko \
- $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00mmio.ko
- AUTOLOAD:=$(call AutoLoad,25,rt2x00mmio rt2x00pci)
+ FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00pci.ko
+ AUTOLOAD:=$(call AutoLoad,26,rt2x00pci)
endef
define KernelPackage/rt2x00-usb
@@ -249,7 +255,7 @@ endef
define KernelPackage/rt2x00-soc
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= @TARGET_ramips +kmod-rt2x00-lib
+ DEPENDS+= @TARGET_ramips +kmod-rt2x00-mmio +kmod-rt2x00-lib
TITLE+= (SoC)
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00soc.ko
AUTOLOAD:=$(call AutoLoad,26,rt2x00soc)
@@ -305,7 +311,7 @@ endef
define KernelPackage/rt2800-pci
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +kmod-rt2x00-pci +kmod-rt2800-lib +kmod-lib-crc-ccitt +TARGET_ramips:kmod-rt2x00-soc
+ DEPENDS+= @(PCI_SUPPORT||TARGET_ramips) +PCI_SUPPORT:kmod-rt2x00-pci +kmod-rt2800-lib +kmod-lib-crc-ccitt +TARGET_ramips:kmod-rt2x00-soc
TITLE+= (RT2860 PCI)
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.ko
AUTOLOAD:=$(call AutoLoad,28,rt2800pci)
@@ -1232,7 +1238,8 @@ config-$(CONFIG_PACKAGE_BRCM80211_DEBUG) += BRCMDBG
config-$(call config_package,mac80211-hwsim) += MAC80211_HWSIM
config-$(call config_package,rt2x00-lib) += RT2X00 RT2X00_LIB
-config-$(call config_package,rt2x00-pci) += RT2X00_LIB_PCI RT2X00_LIB_MMIO
+config-$(call config_package,rt2x00-pci) += RT2X00_LIB_PCI
+config-$(call config_package,rt2x00-mmio) += RT2X00_LIB_MMIO
config-$(call config_package,rt2x00-usb) += RT2X00_LIB_USB
config-$(call config_package,rt2x00-soc) += RT2X00_LIB_SOC
config-$(CONFIG_PACKAGE_RT2X00_LIB_DEBUGFS) += RT2X00_LIB_DEBUGFS
@@ -1582,6 +1589,7 @@ $(eval $(call KernelPackage,p54-pci))
$(eval $(call KernelPackage,p54-usb))
$(eval $(call KernelPackage,p54-spi))
$(eval $(call KernelPackage,rt2x00-lib))
+$(eval $(call KernelPackage,rt2x00-mmio))
$(eval $(call KernelPackage,rt2x00-pci))
$(eval $(call KernelPackage,rt2x00-usb))
$(eval $(call KernelPackage,rt2x00-soc))