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/piix.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/piix.c')
| -rw-r--r-- | drivers/ide/pci/piix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c index 7fc3022dcf68..30cfc815fe31 100644 --- a/drivers/ide/pci/piix.c +++ b/drivers/ide/pci/piix.c | |||
| @@ -256,7 +256,7 @@ static const struct ich_laptop ich_laptop[] = { | |||
| 256 | { 0, } | 256 | { 0, } |
| 257 | }; | 257 | }; |
| 258 | 258 | ||
| 259 | static u8 __devinit piix_cable_detect(ide_hwif_t *hwif) | 259 | static u8 piix_cable_detect(ide_hwif_t *hwif) |
| 260 | { | 260 | { |
| 261 | struct pci_dev *pdev = to_pci_dev(hwif->dev); | 261 | struct pci_dev *pdev = to_pci_dev(hwif->dev); |
| 262 | const struct ich_laptop *lap = &ich_laptop[0]; | 262 | const struct ich_laptop *lap = &ich_laptop[0]; |