Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[cascardo/linux.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 1a93888..96a2006 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -266,10 +266,15 @@ config MACH_COLIBRI
        select PXA27x
 
 config MACH_COLIBRI300
-       bool "Toradex Colibri PXA300"
+       bool "Toradex Colibri PXA300/310"
        select PXA3xx
        select CPU_PXA300
 
+config MACH_COLIBRI320
+       bool "Toradex Colibri PXA320"
+       select PXA3xx
+       select CPU_PXA320
+
 config MACH_ZYLONITE
        bool "PXA3xx Development Platform (aka Zylonite)"
        select PXA3xx