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/pci/alim15x3.c | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'drivers/ide/pci/alim15x3.c')
| -rw-r--r-- | drivers/ide/pci/alim15x3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index b582687e0cd4..d647526af557 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
| @@ -371,7 +371,7 @@ static int ali_cable_override(struct pci_dev *pdev) | |||
| 371 | * FIXME: frobs bits that are not defined on newer ALi devicea | 371 | * FIXME: frobs bits that are not defined on newer ALi devicea |
| 372 | */ | 372 | */ |
| 373 | 373 | ||
| 374 | static u8 __devinit ali_cable_detect(ide_hwif_t *hwif) | 374 | static u8 ali_cable_detect(ide_hwif_t *hwif) |
| 375 | { | 375 | { |
| 376 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 376 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
| 377 | unsigned long flags; | 377 | unsigned long flags; |