diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-05-15 08:58:02 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-05-15 08:58:02 +0000 |
| commit | 4977bd61342fa258225227d28be9eee4dbd9b939 (patch) | |
| tree | abb636750bd6913080724b3e4979641a6c0c76a0 | |
| parent | 7136fa07eef33b43d8cb29a0f15bddb552401d3d (diff) | |
| download | upstream-4977bd61342fa258225227d28be9eee4dbd9b939.tar.gz upstream-4977bd61342fa258225227d28be9eee4dbd9b939.tar.bz2 upstream-4977bd61342fa258225227d28be9eee4dbd9b939.zip | |
cardbus != pcmcia -- disable it in b43
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15857 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/mac80211/Makefile | 4 | ||||
| -rw-r--r-- | target/linux/brcm63xx/config-2.6.27 | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index a6af5646f2..004c2ea29a 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -400,7 +400,6 @@ BUILDFLAGS:= \ $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS) \ $(if $(CONFIG_RFKILL),-DCONFIG_B43_RFKILL -DCONFIG_B43LEGACY_RFKILL) \ $(if $(CONFIG_HW_RANDOM),-DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG) \ - $(if $(CONFIG_PCMCIA),-DCONFIG_B43_PCMCIA -DCONFIG_B43_PIO) \ $(if $(CONFIG_DEBUG_FS), -DCONFIG_MAC80211_DEBUGFS) \ -D__CONFIG_MAC80211_RC_DEFAULT=minstrel \ @@ -414,14 +413,13 @@ MAKE_OPTS:= \ CONFIG_MAC80211_RC_MINSTREL=y \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ CONFIG_MAC80211_DEBUGFS=$(CONFIG_DEBUG_FS) \ + CONFIG_B43_PCMCIA=n CONFIG_B43_PIO=n \ $(if $(CONFIG_PCI),CONFIG_B43_PCI_AUTOSELECT=y,CONFIG_B43_PCI_AUTOSELECT=n) \ $(if $(CONFIG_PCI),CONFIG_B43_PCICORE_AUTOSELECT=y,CONFIG_B43_PCICORE_AUTOSELECT=n) \ $(if $(CONFIG_PCI),CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y,CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=n) \ $(if $(CONFIG_PCI),CONFIG_SSB_DRIVER_PCICORE=y,CONFIG_SSB_DRIVER_PCICORE=n) \ $(if $(CONFIG_PCI),CONFIG_SSB_PCIHOST_POSSIBLE=y,CONFIG_SSB_PCIHOST_POSSIBLE=n) \ $(if $(CONFIG_PCI),CONFIG_SSB_PCIHOST=y,CONFIG_SSB_PCIHOST=n) \ - $(if $(CONFIG_PCMCIA),CONFIG_B43_PCMCIA=y,CONFIG_B43_PCMCIA=n) \ - $(if $(CONFIG_PCMCIA),CONFIG_B43_PIO=y,CONFIG_B43_PIO=n) \ $(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y,CONFIG_B43_RFKILL=n) \ $(if $(CONFIG_RFKILL),CONFIG_B43LEGACY_RFKILL=y,CONFIG_B43LEGACY_RFKILL=n) \ CONFIG_B43LEGACY_LEDS=$(CONFIG_LEDS_TRIGGERS) \ diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27 index 4b33c3ccfb..a2596e8392 100644 --- a/target/linux/brcm63xx/config-2.6.27 +++ b/target/linux/brcm63xx/config-2.6.27 @@ -188,7 +188,6 @@ CONFIG_SQUASHFS_EMBEDDED=y CONFIG_SQUASHFS_VMALLOC=y CONFIG_SSB=y CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_BLOCKIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y CONFIG_SSB_PCIHOST=y |