diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-30 22:35:56 -0500 |
| commit | d62e54abca1146981fc9f98f85ff398a113a22c2 (patch) | |
| tree | 870420dbc4c65e716dcef8a802aafdc0ef97a8b4 /drivers/ide/ide.c | |
| parent | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (diff) | |
| parent | ce362c009250340358a7221f3cdb7954cbf19c01 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/ide/ide.c')
| -rw-r--r-- | drivers/ide/ide.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index b2cc43702f65..3fdab563fec2 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
| @@ -2058,7 +2058,7 @@ static void __init parse_options (char *line) | |||
| 2058 | } | 2058 | } |
| 2059 | } | 2059 | } |
| 2060 | 2060 | ||
| 2061 | int init_module (void) | 2061 | int __init init_module (void) |
| 2062 | { | 2062 | { |
| 2063 | parse_options(options); | 2063 | parse_options(options); |
| 2064 | return ide_init(); | 2064 | return ide_init(); |