diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-17 17:13:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-17 17:13:18 +0100 |
| commit | e1342f1da06d39b3bbd530e9306347c4438bc6e5 (patch) | |
| tree | 3d8d70c1e633d9bd5b929ad27b8123faa7789b84 /drivers/ide/icside.c | |
| parent | 776abac81764847338a6a02c34609d4b8dfb4918 (diff) | |
| parent | ee348d5a1d810bc9958cabb7c27302aab235d36e (diff) | |
| download | kernel_samsung_smdk4412-e1342f1da06d39b3bbd530e9306347c4438bc6e5.zip kernel_samsung_smdk4412-e1342f1da06d39b3bbd530e9306347c4438bc6e5.tar.gz kernel_samsung_smdk4412-e1342f1da06d39b3bbd530e9306347c4438bc6e5.tar.bz2 | |
Merge branch 'smp-fix'
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 4e16ce6..36da913 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c @@ -466,7 +466,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) struct ide_host *host; unsigned int sel = 0; int ret; - hw_regs_t hw[2], *hws[] = { &hw[0], NULL, NULL, NULL }; + hw_regs_t hw[2], *hws[] = { &hw[0], &hw[1], NULL, NULL }; struct ide_port_info d = icside_v6_port_info; ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0); |