Merge branch 'master' into upstream

[sfrench/cifs-2.6.git] / arch / arm / mach-ep93xx / Kconfig

diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index cec5a21ca4e341593e5a6b4470a7cc903c111f70..e346b03cd92114ed29ef44770de626c404e4df34 100644 (file)
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -2,8 +2,37 @@ if ARCH_EP93XX
 
 menu "Cirrus EP93xx Implementation Options"
 
+config CRUNCH
+       bool "Support for MaverickCrunch"
+       help
+         Enable kernel support for MaverickCrunch.
+
 comment "EP93xx Platforms"
 
+config MACH_EDB9302
+       bool "Support Cirrus Logic EDB9302"
+       help
+         Say 'Y' here if you want your kernel to support the Cirrus
+         Logic EDB9302 Evaluation Board.
+
+config MACH_EDB9312
+       bool "Support Cirrus Logic EDB9312"
+       help
+         Say 'Y' here if you want your kernel to support the Cirrus
+         Logic EDB9312 Evaluation Board.
+
+config MACH_EDB9315
+       bool "Support Cirrus Logic EDB9315"
+       help
+         Say 'Y' here if you want your kernel to support the Cirrus
+         Logic EDB9315 Evaluation Board.
+
+config MACH_EDB9315A
+       bool "Support Cirrus Logic EDB9315A"
+       help
+         Say 'Y' here if you want your kernel to support the Cirrus
+         Logic EDB9315A Evaluation Board.
+
 config MACH_GESBC9312
        bool "Support Glomation GESBC-9312-sx"
        help