Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-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 f8b91ea..ddcd41b 100644 (file)
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -74,6 +74,24 @@ config MACH_MSS2
          Say 'Y' here if you want your kernel to support the
          Maxtor Shared Storage II platform.
 
+config MACH_WNR854T
+       bool "Netgear WNR854T"
+       help
+         Say 'Y' here if you want your kernel to support the
+         Netgear WNR854T platform.
+
+config MACH_RD88F5181L_GE
+       bool "Marvell Orion-VoIP GE Reference Design"
+       help
+         Say 'Y' here if you want your kernel to support the
+         Marvell Orion-VoIP GE (88F5181L) RD.
+
+config MACH_RD88F5181L_FXO
+       bool "Marvell Orion-VoIP FXO Reference Design"
+       help
+         Say 'Y' here if you want your kernel to support the
+         Marvell Orion-VoIP FXO (88F5181L) RD.
+
 endmenu
 
 endif