diff options
author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-06-12 15:06:58 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-12 15:06:58 -0400 |
commit | 53eb2fbeb9e68e1a9a23945de8450999c46270ce (patch) | |
tree | 3c50f8690f63b53b3cffbcc226cbbe3c8c6de753 /drivers/ide/ide-generic.c | |
parent | 8344b568f5bdc7ee1bba909de3294c6348c36056 (diff) | |
parent | 0e6859d49ff194e01afc229c996e3aefca1a0539 (diff) |
Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 into linux-next
Diffstat (limited to 'drivers/ide/ide-generic.c')
-rw-r--r-- | drivers/ide/ide-generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c index a6073e248f45..9134488ac043 100644 --- a/drivers/ide/ide-generic.c +++ b/drivers/ide/ide-generic.c | |||
@@ -125,6 +125,7 @@ static int __init ide_generic_init(void) | |||
125 | memset(&hw, 0, sizeof(hw)); | 125 | memset(&hw, 0, sizeof(hw)); |
126 | ide_std_init_ports(&hw, io_addr, io_addr + 0x206); | 126 | ide_std_init_ports(&hw, io_addr, io_addr + 0x206); |
127 | hw.irq = ide_default_irq(io_addr); | 127 | hw.irq = ide_default_irq(io_addr); |
128 | hw.chipset = ide_generic; | ||
128 | ide_init_port_hw(hwif, &hw); | 129 | ide_init_port_hw(hwif, &hw); |
129 | 130 | ||
130 | idx[i] = i; | 131 | idx[i] = i; |