[PATCH] Some includes that aren't needed.

Stale cruft, and what looks like a merge error.

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 82454808c6c06eaf5f7bd49d48a8bc5135f9cb09..328875a7181579ccf1e7c70aa8a496190609c5a9 100644 (file)
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -34,7 +34,6 @@
 #include <linux/smp_lock.h>
 #include <linux/vmalloc.h>
 
-#include <asm/system.h>
 #include <asm/io.h>
 
 #include <linux/blk.h>

diff --git a/include/linux/udf_fs.h b/include/linux/udf_fs.h
index 07cbb273974f616f801a619237c68f5188bc2c6f..83eddc46650f68e282df17c7d3381f562d6e8242 100644 (file)
--- a/include/linux/udf_fs.h
+++ b/include/linux/udf_fs.h
@@ -36,8 +36,6 @@
 
 #include <linux/config.h>
 
-#include <linux/config.h>
-
 #define UDF_PREALLOCATE
 #define UDF_DEFAULT_PREALLOC_BLOCKS    8