Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[linux-2.6] / arch / arm / mach-ep93xx / Kconfig

diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index af7904b3d0a864149593d38e307f7debbc49267f..ea8549bfbef2fa69b9f94fc54428671df988fdeb 100644 (file)
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -27,6 +27,12 @@ config MACH_EDB9302A
          Say 'Y' here if you want your kernel to support the Cirrus
          Logic EDB9302A Evaluation Board.
 
          Say 'Y' here if you want your kernel to support the Cirrus
          Logic EDB9302A Evaluation Board.
 

+config MACH_EDB9307
+       bool "Support Cirrus Logic EDB9307"
+       help
+         Say 'Y' here if you want your kernel to support the Cirrus
+         Logic EDB9307 Evaluation Board.
+

 config MACH_EDB9312
        bool "Support Cirrus Logic EDB9312"
        help
 config MACH_EDB9312
        bool "Support Cirrus Logic EDB9312"
        help


@@ -51,6 +57,31 @@ config MACH_GESBC9312
          Say 'Y' here if you want your kernel to support the Glomation
          GESBC-9312-sx board.
 
          Say 'Y' here if you want your kernel to support the Glomation
          GESBC-9312-sx board.
 

+config MACH_MICRO9
+        bool
+        default n
+
+config MACH_MICRO9H
+       bool "Support Contec Hypercontrol Micro9-H"
+       select MACH_MICRO9
+       help
+         Say 'Y' here if you want your kernel to support the
+         Contec Hypercontrol Micro9-H board.
+
+config MACH_MICRO9M
+       bool "Support Contec Hypercontrol Micro9-M"
+       select MACH_MICRO9
+       help
+         Say 'Y' here if you want your kernel to support the
+         Contec Hypercontrol Micro9-M board.
+
+config MACH_MICRO9L
+       bool "Support Contec Hypercontrol Micro9-L"
+       select MACH_MICRO9
+       help
+         Say 'Y' here if you want your kernel to support the
+         Contec Hypercontrol Micro9-L board.
+

 config MACH_TS72XX
        bool "Support Technologic Systems TS-72xx SBC"
        help
 config MACH_TS72XX
        bool "Support Technologic Systems TS-72xx SBC"
        help