diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 11:32:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:01 -0500 |
| commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
| tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /drivers/ide/icside.c | |
| parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
| parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) | |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/ide/icside.c')
| -rw-r--r-- | drivers/ide/icside.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c index 97a35c667aee..415d7e24f2b6 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c | |||
| @@ -534,7 +534,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) | |||
| 534 | d.dma_ops = NULL; | 534 | d.dma_ops = NULL; |
| 535 | } | 535 | } |
| 536 | 536 | ||
| 537 | ret = ide_host_register(host, NULL, hws); | 537 | ret = ide_host_register(host, &d, hws); |
| 538 | if (ret) | 538 | if (ret) |
| 539 | goto err_free; | 539 | goto err_free; |
| 540 | 540 | ||