diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /drivers/ide/icside.c | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
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 | ||