Merge branch 'linux-2.6'

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

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index e5b7063ed81807470077d5890fe69199a18ef9c6..0908bea0f60968a3becd9223b3626074c84e10c2 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -103,6 +103,10 @@ config MACH_EM_X270
        bool "CompuLab EM-x270 platform"
        select PXA27x
 
+config MACH_COLIBRI
+       bool "Toradex Colibri PX27x"
+       select PXA27x
+
 config MACH_ZYLONITE
        bool "PXA3xx Development Platform"
        select PXA3xx