Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

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

diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index 6f991c5..fd5e7b6 100644 (file)
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -179,6 +179,25 @@ config MACH_GTWX5715
                "High Speed" UART is n/c (as far as I can tell)
                20 Pin ARM/Xscale JTAG interface on J2
 
+config MACH_DEVIXP
+       bool "Omicron DEVIXP"
+       help
+         Say 'Y' here if you want your kernel to support the DEVIXP
+         board from OMICRON electronics GmbH.
+
+config MACH_MICCPT
+       bool "Omicron MICCPT"
+       select PCI
+       help
+         Say 'Y' here if you want your kernel to support the MICCPT
+         board from OMICRON electronics GmbH.
+
+config MACH_MIC256
+       bool "Omicron MIC256"
+       help
+         Say 'Y' here if you want your kernel to support the MIC256
+         board from OMICRON electronics GmbH.
+
 comment "IXP4xx Options"
 
 config IXP4XX_INDIRECT_PCI