diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:25:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:25:56 -0400 |
| commit | c444debaaa22011b4a84e58e5333575b3f800a33 (patch) | |
| tree | 896a9589aa9e701896da7ea1ae6a24cb04495b8f /drivers/ide/legacy/macide.c | |
| parent | 70ef6d595b6e51618a0cbe44b848d8c9db11a010 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'drivers/ide/legacy/macide.c')
| -rw-r--r-- | drivers/ide/legacy/macide.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c index caa2632dd08e..2e84290d0bcc 100644 --- a/drivers/ide/legacy/macide.c +++ b/drivers/ide/legacy/macide.c | |||
| @@ -78,6 +78,8 @@ static void __init macide_setup_ports(hw_regs_t *hw, unsigned long base, | |||
| 78 | 78 | ||
| 79 | hw->irq = irq; | 79 | hw->irq = irq; |
| 80 | hw->ack_intr = ack_intr; | 80 | hw->ack_intr = ack_intr; |
| 81 | |||
| 82 | hw->chipset = ide_generic; | ||
| 81 | } | 83 | } |
| 82 | 84 | ||
| 83 | static const char *mac_ide_name[] = | 85 | static const char *mac_ide_name[] = |