diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /drivers/ide/h8300/ide-h8300.c | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ide/h8300/ide-h8300.c')
| -rw-r--r-- | drivers/ide/h8300/ide-h8300.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c index 88750a300337..6d26ad7360d5 100644 --- a/drivers/ide/h8300/ide-h8300.c +++ b/drivers/ide/h8300/ide-h8300.c | |||
| @@ -101,7 +101,7 @@ void __init h8300_ide_init(void) | |||
| 101 | hw_setup(&hw); | 101 | hw_setup(&hw); |
| 102 | 102 | ||
| 103 | /* register if */ | 103 | /* register if */ |
| 104 | idx = ide_register_hw(&hw, &hwif); | 104 | idx = ide_register_hw(&hw, 1, &hwif); |
| 105 | if (idx == -1) { | 105 | if (idx == -1) { |
| 106 | printk(KERN_ERR "ide-h8300: IDE I/F register failed\n"); | 106 | printk(KERN_ERR "ide-h8300: IDE I/F register failed\n"); |
| 107 | return; | 107 | return; |