diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /drivers/ide/ide.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
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 4a8952a6c3da..477833f0daf5 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
| @@ -1229,7 +1229,7 @@ static int __init ide_setup(char *s) | |||
| 1229 | if (!strcmp(s, "ide=reverse")) { | 1229 | if (!strcmp(s, "ide=reverse")) { |
| 1230 | ide_scan_direction = 1; | 1230 | ide_scan_direction = 1; |
| 1231 | printk(" : Enabled support for IDE inverse scan order.\n"); | 1231 | printk(" : Enabled support for IDE inverse scan order.\n"); |
| 1232 | return 1; | 1232 | goto obsolete_option; |
| 1233 | } | 1233 | } |
| 1234 | #endif | 1234 | #endif |
| 1235 | 1235 | ||