Merge branches 'pxa' and 'orion-fixes1'

[linux-2.6] / arch / arm / mach-omap1 / id.c

diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c
index 5c637c0483688d9ef1a6172ad6a5fd437ba3cad2..da13c3e82850e46e274a78acc4e0d3aed803ddc1 100644 (file)
--- a/arch/arm/mach-omap1/id.c
+++ b/arch/arm/mach-omap1/id.c
@@ -11,7 +11,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>