[ARM] Merge AT91 and devel branches

[linux-2.6-omap-h63xx.git] / drivers / s390 / block / dasd_erp.c

diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c
index 4108d96f6a5a8b9ae5622c79efc09f16adf38b04..58a65097922bb430d3f8e6b224755596e71fb746 100644 (file)
--- a/drivers/s390/block/dasd_erp.c
+++ b/drivers/s390/block/dasd_erp.c
@@ -9,7 +9,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/ctype.h>
 #include <linux/init.h>