aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-08-10 18:26:18 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-08-10 18:26:18 +0000
commitece3bdcdd6c1ceed6a841d3e2ff5600209b1f600 (patch)
treeb38a1200ff086d98a2b41097491cfd187a0f243b
parent08f7b6c4081156dfca20d6cf3c4a775d53c975b2 (diff)
downloadupstream-ece3bdcdd6c1ceed6a841d3e2ff5600209b1f600.tar.gz
upstream-ece3bdcdd6c1ceed6a841d3e2ff5600209b1f600.tar.bz2
upstream-ece3bdcdd6c1ceed6a841d3e2ff5600209b1f600.zip
Correct bool expressions in dependencies. This fixes #5627
SVN-Revision: 17208
-rw-r--r--package/kernel/modules/fs.mk2
-rw-r--r--package/mac80211/Makefile8
2 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index d14b99fdbe..7795280c70 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -365,7 +365,7 @@ define KernelPackage/fs-btrfs
CONFIG_BTRFS_FS \
CONFIG_BTRFS_FS_POSIX_ACL=n
# for crc32c
- DEPENDS:=+kmod-crypto-core @!LINUX_2_6_21||!LINUX_2_6_25||!LINUX_2_6_28
+ DEPENDS:=+kmod-crypto-core @!LINUX_2_6_21&&!LINUX_2_6_25&&!LINUX_2_6_28
FILES:=\
$(LINUX_DIR)/crypto/crc32c.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 51022dfa71..f382027e73 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -211,7 +211,7 @@ endef
define KernelPackage/rt2800-pci
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= +kmod-rt2x00-pci +kmod-crc-ccitt @!LINUX_2_6_21||!LINUX_2_6_25
+ DEPENDS+= +kmod-rt2x00-pci +kmod-crc-ccitt @!LINUX_2_6_21&&!LINUX_2_6_25
TITLE+= (RT2860 PCI)
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800pci.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt2800pci)
@@ -219,7 +219,7 @@ endef
define KernelPackage/rt2800-usb
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= +kmod-rt2x00-usb +kmod-crc-ccitt @!LINUX_2_6_21||!LINUX_2_6_25
+ DEPENDS+= +kmod-rt2x00-usb +kmod-crc-ccitt @!LINUX_2_6_21&&!LINUX_2_6_25
TITLE+= (RT2870 USB)
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800usb.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt2800usb)
@@ -229,7 +229,7 @@ define KernelPackage/rtl818x/Default
$(call KernelPackage/mac80211/Default)
TITLE:=Realtek Drivers for RTL818x devices
URL:=http://wireless.kernel.org/en/users/Drivers/rtl8187
- DEPENDS+= +kmod-eeprom-93cx6 +kmod-mac80211 @!LINUX_2_6_21||!LINUX_2_6_25
+ DEPENDS+= +kmod-eeprom-93cx6 +kmod-mac80211 @!LINUX_2_6_21&&!LINUX_2_6_25
endef
define KernelPackage/rtl8180
@@ -296,7 +296,7 @@ define KernelPackage/ath9k
$(call KernelPackage/mac80211/Default)
TITLE:=Atheros 802.11n wireless cards support
URL:=http://linuxwireless.org/en/users/Drivers/ath9k
- DEPENDS+= +kmod-ath @!LINUX_2_6_21||!LINUX_2_6_25
+ DEPENDS+= +kmod-ath @!LINUX_2_6_21&&!LINUX_2_6_25
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,ath9k)
endef