git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
ata
/
ata_piix.c
diff --git
a/drivers/ata/ata_piix.c
b/drivers/ata/ata_piix.c
index
b1d08a8
..
e6b4606
100644
(file)
--- a/
drivers/ata/ata_piix.c
+++ b/
drivers/ata/ata_piix.c
@@
-1499,7
+1499,7
@@
static int __devinit piix_init_one(struct pci_dev *pdev,
* off.
*/
if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2652) {
-
int
rc = piix_disable_ahci(pdev);
+ rc = piix_disable_ahci(pdev);
if (rc)
return rc;
}