diff --git a/[refs] b/[refs]
index 1f1d4dde582c..f78f1c4277d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1493df7319e06fb6ae6daa7e0d28355e6e8be1c9
+refs/heads/master: 9035a9ece9819155ed6a12654ab5d5293d3f2545
diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig
index ca2bd593ca30..4bd0f8740b24 100644
--- a/trunk/arch/arm/mach-pxa/Kconfig
+++ b/trunk/arch/arm/mach-pxa/Kconfig
@@ -254,6 +254,7 @@ config MACH_COLIBRI300
 	bool "Toradex Colibri PXA300/310"
 	select PXA3xx
 	select CPU_PXA300
+	select CPU_PXA310
 
 config MACH_COLIBRI320
 	bool "Toradex Colibri PXA320"