diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-27 14:07:10 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-27 14:07:10 -0500 |
| commit | 9ef64cb4320df821638b508f79aa8b858cca99f0 (patch) | |
| tree | 4efbf0854234f89c6f4413077ec795fc669b5b0a /drivers/ide/ide.c | |
| parent | 6f157c1d268d5888ca44c589dccd01729c4172f6 (diff) | |
| parent | 7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 | ||