aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2005-11-03 04:28:44 +0000
committerNicolas Thill <nico@openwrt.org>2005-11-03 04:28:44 +0000
commit312d4e6ac4dca9caf6ebfb30fe83031722190d41 (patch)
treeadb94619172106c38a96c5c08e32890bdcb6ef1a /target
parenta197235b683be69661143e0836b4058fd3121381 (diff)
downloadupstream-312d4e6ac4dca9caf6ebfb30fe83031722190d41.tar.gz
upstream-312d4e6ac4dca9caf6ebfb30fe83031722190d41.tar.bz2
upstream-312d4e6ac4dca9caf6ebfb30fe83031722190d41.zip
disable alsa and openswan on brcm-2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2321 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/package/Makefile4
-rw-r--r--target/linux/package/alsa/Config.in1
-rw-r--r--target/linux/package/openswan/Config.in1
3 files changed, 6 insertions, 0 deletions
diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile
index db63d4f577..a3d06b71d1 100644
--- a/target/linux/package/Makefile
+++ b/target/linux/package/Makefile
@@ -2,13 +2,17 @@
include $(TOPDIR)/rules.mk
ifneq ($(BOARD),ar7)
+ifneq ($(BOARD)-$(KERNEL),brcm-2.6)
package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
endif
+endif
package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
package-$(BR2_PACKAGE_KMOD_HOSTAP) += hostap
package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
+ifneq ($(BOARD)-$(KERNEL),brcm-2.6)
package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
+endif
package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
package-y += base-files
diff --git a/target/linux/package/alsa/Config.in b/target/linux/package/alsa/Config.in
index 62dd21b97a..a68be7a6ad 100644
--- a/target/linux/package/alsa/Config.in
+++ b/target/linux/package/alsa/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_KMOD_ALSA
prompt "kmod-alsa......................... Alsa Sound Drivers"
+ prompt "kmod-alsa......................... Alsa Sound Drivers (FIXME, does not build on 2.6/mipsel)" if BR2_LINUX_2_6_BRCM
tristate
default m if CONFIG_DEVEL
depends BR2_PACKAGE_KMOD_USB_CONTROLLER
diff --git a/target/linux/package/openswan/Config.in b/target/linux/package/openswan/Config.in
index 59a943f8e4..52b52ba116 100644
--- a/target/linux/package/openswan/Config.in
+++ b/target/linux/package/openswan/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_KMOD_OPENSWAN
prompt "kmod-openswan..................... Openswan kernel module"
+ prompt "kmod-openswan..................... Openswan kernel module (FIXME, does not build on 2.6/mipsel)" if BR2_LINUX_2_6_BRCM
tristate
default m if CONFIG_DEVEL
help