Merge branch 'next/drivers' into HEAD

[deliverable/linux.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 40373db649aa3e8fc16fcb57b0002777e9e277c3..cf2362ccb234cfe7f980fccfb34c3f7bc8bacf50 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -22,10 +22,10 @@
 #include <asm/cputype.h>
 
 #include "common.h"
-#include <plat/cpu.h>
 
-#include <mach/id.h>
+#include "id.h"
 
+#include "soc.h"
 #include "control.h"
 
 static unsigned int omap_revision;
@@ -161,9 +161,8 @@ void __init omap2xxx_check_revision(void)
        }
 
        if (j == ARRAY_SIZE(omap_ids)) {
-               printk(KERN_ERR "Unknown OMAP device type. "
-                               "Handling it as OMAP%04x\n",
-                               omap_ids[i].type >> 16);
+               pr_err("Unknown OMAP device type. Handling it as OMAP%04x\n",
+                      omap_ids[i].type >> 16);
                j = i;
        }