Changeset 15857


Ignore:
Timestamp:
2009-05-15T10:58:02+02:00 (9 years ago)
Author:
kaloz
Message:

cardbus != pcmcia -- disable it in b43

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/Makefile

    r15784 r15857  
    401401        $(if $(CONFIG_RFKILL),-DCONFIG_B43_RFKILL -DCONFIG_B43LEGACY_RFKILL) \ 
    402402        $(if $(CONFIG_HW_RANDOM),-DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG) \ 
    403         $(if $(CONFIG_PCMCIA),-DCONFIG_B43_PCMCIA -DCONFIG_B43_PIO) \ 
    404403        $(if $(CONFIG_DEBUG_FS), -DCONFIG_MAC80211_DEBUGFS) \ 
    405404        -D__CONFIG_MAC80211_RC_DEFAULT=minstrel \ 
     
    415414        CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ 
    416415        CONFIG_MAC80211_DEBUGFS=$(CONFIG_DEBUG_FS) \ 
     416        CONFIG_B43_PCMCIA=n CONFIG_B43_PIO=n \ 
    417417        $(if $(CONFIG_PCI),CONFIG_B43_PCI_AUTOSELECT=y,CONFIG_B43_PCI_AUTOSELECT=n) \ 
    418418        $(if $(CONFIG_PCI),CONFIG_B43_PCICORE_AUTOSELECT=y,CONFIG_B43_PCICORE_AUTOSELECT=n) \ 
     
    421421        $(if $(CONFIG_PCI),CONFIG_SSB_PCIHOST_POSSIBLE=y,CONFIG_SSB_PCIHOST_POSSIBLE=n) \ 
    422422        $(if $(CONFIG_PCI),CONFIG_SSB_PCIHOST=y,CONFIG_SSB_PCIHOST=n) \ 
    423         $(if $(CONFIG_PCMCIA),CONFIG_B43_PCMCIA=y,CONFIG_B43_PCMCIA=n) \ 
    424         $(if $(CONFIG_PCMCIA),CONFIG_B43_PIO=y,CONFIG_B43_PIO=n) \ 
    425423        $(if $(CONFIG_RFKILL),CONFIG_B43_RFKILL=y,CONFIG_B43_RFKILL=n) \ 
    426424        $(if $(CONFIG_RFKILL),CONFIG_B43LEGACY_RFKILL=y,CONFIG_B43LEGACY_RFKILL=n) \ 
  • trunk/target/linux/brcm63xx/config-2.6.27

    r15856 r15857  
    189189CONFIG_SSB=y 
    190190CONFIG_SSB_B43_PCI_BRIDGE=y 
    191 CONFIG_SSB_BLOCKIO=y 
    192191CONFIG_SSB_DRIVER_PCICORE=y 
    193192CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y 
Note: See TracChangeset for help on using the changeset viewer.