aboutsummaryrefslogtreecommitdiffstats
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
commit4d2c00455f9e51acb74f649615c2403ebcd72beb (patch)
tree47c5f8f19bed3abb339f618112e54e4bda74f1d3
parent863bd41e5e0dfe3dfb93dfb08fd4916549f7bf2b (diff)
downloadupstream-4d2c00455f9e51acb74f649615c2403ebcd72beb.tar.gz
upstream-4d2c00455f9e51acb74f649615c2403ebcd72beb.tar.bz2
upstream-4d2c00455f9e51acb74f649615c2403ebcd72beb.zip
disable alsa and openswan on brcm-2.6
SVN-Revision: 2321
-rw-r--r--openwrt/target/linux/package/Makefile4
-rw-r--r--openwrt/target/linux/package/alsa/Config.in1
-rw-r--r--openwrt/target/linux/package/openswan/Config.in1
3 files changed, 6 insertions, 0 deletions
diff --git a/openwrt/target/linux/package/Makefile b/openwrt/target/linux/package/Makefile
index db63d4f577..a3d06b71d1 100644
--- a/openwrt/target/linux/package/Makefile
+++ b/openwrt/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/openwrt/target/linux/package/alsa/Config.in b/openwrt/target/linux/package/alsa/Config.in
index 62dd21b97a..a68be7a6ad 100644
--- a/openwrt/target/linux/package/alsa/Config.in
+++ b/openwrt/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/openwrt/target/linux/package/openswan/Config.in b/openwrt/target/linux/package/openswan/Config.in
index 59a943f8e4..52b52ba116 100644
--- a/openwrt/target/linux/package/openswan/Config.in
+++ b/openwrt/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