projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' into upstream
[powerpc.git]
/
block
/
deadline-iosched.c
diff --git
a/block/deadline-iosched.c
b/block/deadline-iosched.c
index
4469dd8
..
c7ca9f0
100644
(file)
--- a/
block/deadline-iosched.c
+++ b/
block/deadline-iosched.c
@@
-8,7
+8,6
@@
#include <linux/blkdev.h>
#include <linux/elevator.h>
#include <linux/bio.h>
#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>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/init.h>