Merge branch 'master' into upstream

[linux-2.6] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 8d7339511e5e962dfccca43298a06e24a48df846..25d1f42568cc19714a2f8a5469ecd2842e9ea7e5 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -2,7 +2,6 @@
  *  gendisk handling
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/genhd.h>