diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /drivers/ide/ide-probe.c | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 994e41099b42..a51a30e9eab3 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
| @@ -1492,7 +1492,7 @@ static struct device_attribute *ide_port_attrs[] = { | |||
| 1492 | 1492 | ||
| 1493 | static int ide_sysfs_register_port(ide_hwif_t *hwif) | 1493 | static int ide_sysfs_register_port(ide_hwif_t *hwif) |
| 1494 | { | 1494 | { |
| 1495 | int i, rc; | 1495 | int i, uninitialized_var(rc); |
| 1496 | 1496 | ||
| 1497 | for (i = 0; ide_port_attrs[i]; i++) { | 1497 | for (i = 0; ide_port_attrs[i]; i++) { |
| 1498 | rc = device_create_file(hwif->portdev, ide_port_attrs[i]); | 1498 | rc = device_create_file(hwif->portdev, ide_port_attrs[i]); |