projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
block
/
elevator.c
diff --git
a/block/elevator.c
b/block/elevator.c
index
56c2ed0
..
0d6be03
100644
(file)
--- a/
block/elevator.c
+++ b/
block/elevator.c
@@
-145,7
+145,7
@@
static int __init elevator_setup(char *str)
strcpy(chosen_elevator, "anticipatory");
else
strncpy(chosen_elevator, str, sizeof(chosen_elevator) - 1);
- return
0
;
+ return
1
;
}
__setup("elevator=", elevator_setup);