diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-22 14:47:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-22 14:47:43 -0700 |
| commit | 7ae9ed8d3221c9f7dd4bc2773ff58797487d5ed8 (patch) | |
| tree | fc9e9d8c0497767880d5fc9fe40f9bf454a522bd /arch/mips/Kconfig | |
| parent | 0dfe178239453547d4297a4583ee7847948a481b (diff) | |
| parent | b38d355eaa223e420d0c45ff7a3279ea811552c5 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 177cdaf8356..0dbb4edc2dd 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -91,15 +91,8 @@ config BCM47XX select DMA_NONCOHERENT select HW_HAS_PCI select IRQ_CPU - select SYS_HAS_CPU_MIPS32_R1 select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN - select SSB - select SSB_DRIVER_MIPS - select SSB_DRIVER_EXTIF - select SSB_EMBEDDED - select SSB_B43_PCI_BRIDGE if PCI - select SSB_PCICORE_HOSTMODE if PCI select GENERIC_GPIO select SYS_HAS_EARLY_PRINTK select CFE @@ -788,6 +781,7 @@ endchoice source "arch/mips/alchemy/Kconfig" source "arch/mips/ath79/Kconfig" +source "arch/mips/bcm47xx/Kconfig" source "arch/mips/bcm63xx/Kconfig" source "arch/mips/jazz/Kconfig" source "arch/mips/jz4740/Kconfig" |