Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / um / sys-i386 / sysrq.c

diff --git a/arch/um/sys-i386/sysrq.c b/arch/um/sys-i386/sysrq.c
index d5244f07053990392d695705013bc86993cad76c..171b3e9dc86777e54cb8a06a43a29e55bb810688 100644 (file)
--- a/arch/um/sys-i386/sysrq.c
+++ b/arch/um/sys-i386/sysrq.c
@@ -3,7 +3,6 @@
  * Licensed under the GPL
  */
 
-#include "linux/config.h"
 #include "linux/kernel.h"
 #include "linux/smp.h"
 #include "linux/sched.h"