Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index c002076b412fd3acbf3bc80ddca5b524cfa9dbcd..002420c45124ea267545ee5f4b8aa7365a0f90f5 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -16,6 +16,8 @@
 #include <linux/init.h>
 #include <linux/io.h>
 
+#include <asm/cputype.h>
+
 #include <mach/common.h>
 #include <mach/control.h>
 #include <mach/cpu.h>