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 f1b740083aee5dfc30967a09540614ddfeb714f9..e346b03cd92114ed29ef44770de626c404e4df34 100644 (file)
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -15,6 +15,12 @@ config MACH_EDB9302
          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