Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into...

[linux-2.6-omap-h63xx.git] / block / as-iosched.c

diff --git a/block/as-iosched.c b/block/as-iosched.c
index 3af31ed49a9c250518e73a5f95818d725c22c409..5da56d48fbd36473ba92fb346a91d06dbea148a1 100644 (file)
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -10,7 +10,6 @@
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
 #include <linux/bio.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/init.h>