Merge branch 'master' into for-next

[deliverable/linux.git] / arch / s390 / oprofile / init.c

diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 0e358c2cffeb5e6bf1955ba6ca2c3de7092e03b3..6efc18b5e60af4e3ce202edb5e381fe2ab45c03e 100644 (file)
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -13,8 +13,6 @@
 #include <linux/oprofile.h>
 #include <linux/init.h>
 #include <linux/errno.h>
-#include <linux/oprofile.h>
-#include <linux/errno.h>
 #include <linux/fs.h>
 
 #include "../../../drivers/oprofile/oprof.h"