Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / arch / s390 / kernel / s390_ksyms.c

diff --git a/arch/s390/kernel/s390_ksyms.c b/arch/s390/kernel/s390_ksyms.c
index 0886e739d12269a121b3a0cdf85f02e4b3c0c7fe..c73a45467fa45f0164a537f2dbb2282660e2570b 100644 (file)
--- a/arch/s390/kernel/s390_ksyms.c
+++ b/arch/s390/kernel/s390_ksyms.c
@@ -3,7 +3,6 @@
  *
  *  S390 version
  */
-#include <linux/config.h>
 #include <linux/highuid.h>
 #include <linux/module.h>
 #include <linux/mm.h>