diff options
author | James Morris <james.l.morris@oracle.com> | 2012-08-17 20:42:30 +1000 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2012-08-17 20:42:30 +1000 |
commit | 51b743fe87d7fb3dba7a2ff4a1fe23bb65dc2245 (patch) | |
tree | f8b8f601713a3ecb264eb9f145636343d9350520 /arch/mips/bcm63xx/Kconfig | |
parent | 9f99798ff49e73dded73a8c674044ea6fb6af651 (diff) | |
parent | d9875690d9b89a866022ff49e3fcea892345ad92 (diff) | |
download | linux-51b743fe87d7fb3dba7a2ff4a1fe23bb65dc2245.tar.gz |
Merge tag 'v3.6-rc2' into next
Linux 3.6-rc2
Resync with Linus.
Diffstat (limited to 'arch/mips/bcm63xx/Kconfig')
-rw-r--r-- | arch/mips/bcm63xx/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/bcm63xx/Kconfig b/arch/mips/bcm63xx/Kconfig index 6b1b9ad8d85..d03e8799d1c 100644 --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig @@ -1,6 +1,10 @@ menu "CPU support" depends on BCM63XX +config BCM63XX_CPU_6328 + bool "support 6328 CPU" + select HW_HAS_PCI + config BCM63XX_CPU_6338 bool "support 6338 CPU" select HW_HAS_PCI |