Merge branch 'linus' into perfcounters/core

Merge reason: Bring in tracing changes we depend on.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 25 insertions, 0 deletions

diff --git a/arch/mips/bcm63xx/Kconfig b/arch/mips/bcm63xx/Kconfig
new file mode 100644
index 000000000000..fb177d6df066
--- /dev/null
+++ b/arch/mips/bcm63xx/Kconfig
@@ -0,0 +1,25 @@
+menu "CPU support"
+        depends on BCM63XX
+
+config BCM63XX_CPU_6338
+        bool "support 6338 CPU"
+        select HW_HAS_PCI
+        select USB_ARCH_HAS_OHCI
+        select USB_OHCI_BIG_ENDIAN_DESC
+        select USB_OHCI_BIG_ENDIAN_MMIO
+
+config BCM63XX_CPU_6345
+        bool "support 6345 CPU"
+        select USB_OHCI_BIG_ENDIAN_DESC
+        select USB_OHCI_BIG_ENDIAN_MMIO
+
+config BCM63XX_CPU_6348
+        bool "support 6348 CPU"
+        select HW_HAS_PCI
+
+config BCM63XX_CPU_6358
+        bool "support 6358 CPU"
+        select HW_HAS_PCI
+endmenu
+
+source "arch/mips/bcm63xx/boards/Kconfig"