Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[pandora-kernel.git] / arch / arm / mach-orion5x / Kconfig

diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index ff405c4..2c7035d 100644 (file)
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -36,6 +36,12 @@ config MACH_TS209
          Say 'Y' here if you want your kernel to support the
          QNAP TS-109/TS-209 platform.
 
+config MACH_TERASTATION_PRO2
+       bool "Buffalo Terastation Pro II/Live"
+       help
+         Say 'Y' here if you want your kernel to support the
+         Buffalo Terastation Pro II/Live platform.
+
 config MACH_LINKSTATION_PRO
        bool "Buffalo Linkstation Pro/Live"
        select I2C_BOARDINFO
@@ -44,6 +50,13 @@ config MACH_LINKSTATION_PRO
          Buffalo Linkstation Pro/Live platform. Both v1 and
          v2 devices are supported.
 
+config MACH_LINKSTATION_MINI
+       bool "Buffalo Linkstation Mini"
+       select I2C_BOARDINFO
+       help
+         Say 'Y' here if you want your kernel to support the
+         Buffalo Linkstation Mini platform.
+
 config MACH_TS409
        bool "QNAP TS-409"
        help
@@ -58,6 +71,7 @@ config MACH_WRT350N_V2
 
 config MACH_TS78XX
        bool "Technologic Systems TS-78xx"
+       select PM
        help
          Say 'Y' here if you want your kernel to support the
          Technologic Systems TS-78xx platform.
@@ -99,6 +113,12 @@ config MACH_RD88F5181L_FXO
          Say 'Y' here if you want your kernel to support the
          Marvell Orion-VoIP FXO (88F5181L) RD.
 
+config MACH_RD88F6183AP_GE
+       bool "Marvell Orion-1-90 AP GE Reference Design"
+       help
+         Say 'Y' here if you want your kernel to support the
+         Marvell Orion-1-90 (88F6183) AP GE RD.
+
 endmenu
 
 endif