Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / arch / powerpc / platforms / 44x / Kconfig

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 3496bc0..bf5c7ff 100644 (file)
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -118,6 +118,17 @@ config GLACIER
        help
          This option enables support for the AMCC PPC460GT evaluation board.
 
+config REDWOOD
+       bool "Redwood"
+       depends on 44x
+       default n
+       select PPC44x_SIMPLE
+       select 460SX
+       select PCI
+       select PPC4xx_PCI_EXPRESS
+       help
+         This option enables support for the AMCC PPC460SX Redwood board.
+
 config YOSEMITE
        bool "Yosemite"
        depends on 44x
@@ -220,6 +231,14 @@ config 460EX
        select IBM_NEW_EMAC_EMAC4
        select IBM_NEW_EMAC_TAH
 
+config 460SX
+       bool
+       select PPC_FPU
+       select IBM_NEW_EMAC_EMAC4
+       select IBM_NEW_EMAC_RGMII
+       select IBM_NEW_EMAC_ZMII
+       select IBM_NEW_EMAC_TAH
+
 # 44x errata/workaround config symbols, selected by the CPU models above
 config IBM440EP_ERR42
        bool