projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux into drm...
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
elevator.h
diff --git
a/include/linux/elevator.h
b/include/linux/elevator.h
index e2a6bd7fb13380bfa4b0d14251b8a64908f8b0f1..45a91474487daff11a69bf55a31d7cd146c75f72 100644
(file)
--- a/
include/linux/elevator.h
+++ b/
include/linux/elevator.h
@@
-143,7
+143,7
@@
extern void elv_drain_elevator(struct request_queue *);
* io scheduler registration
*/
extern void __init load_default_elevator_module(void);
-extern int
__init
elv_register(struct elevator_type *);
+extern int elv_register(struct elevator_type *);
extern void elv_unregister(struct elevator_type *);
/*