diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /drivers/ide/arm | |
parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/ide/arm')
-rw-r--r-- | drivers/ide/arm/palm_bk3710.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c index 3e842d60eae9..f788fa5a977b 100644 --- a/drivers/ide/arm/palm_bk3710.c +++ b/drivers/ide/arm/palm_bk3710.c | |||
@@ -309,7 +309,7 @@ static void __devinit palm_bk3710_chipinit(void __iomem *base) | |||
309 | palm_bk3710_setpiomode(base, NULL, 1, 600, 0); | 309 | palm_bk3710_setpiomode(base, NULL, 1, 600, 0); |
310 | } | 310 | } |
311 | 311 | ||
312 | static u8 __devinit palm_bk3710_cable_detect(ide_hwif_t *hwif) | 312 | static u8 palm_bk3710_cable_detect(ide_hwif_t *hwif) |
313 | { | 313 | { |
314 | return ATA_CBL_PATA80; | 314 | return ATA_CBL_PATA80; |
315 | } | 315 | } |