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/wim/linux-2.6-watchdog
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
drivers
/
ide
/
ide.c
diff --git
a/drivers/ide/ide.c
b/drivers/ide/ide.c
index
b2cc437
..
3fdab56
100644
(file)
--- a/
drivers/ide/ide.c
+++ b/
drivers/ide/ide.c
@@
-2058,7
+2058,7
@@
static void __init parse_options (char *line)
}
}
-int init_module (void)
+int
__init
init_module (void)
{
parse_options(options);
return ide_init();