git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
ata
/
ahci_xgene.c
diff --git
a/drivers/ata/ahci_xgene.c
b/drivers/ata/ahci_xgene.c
index ad58da7c9affd8e4ec381d8bb0fd7f23d6fa0310..7e157e1bf65e47f160a10b9e8a6a335bbaaa8d5c 100644
(file)
--- a/
drivers/ata/ahci_xgene.c
+++ b/
drivers/ata/ahci_xgene.c
@@
-759,7
+759,7
@@
static int xgene_ahci_probe(struct platform_device *pdev)
&xgene_ahci_v2_port_info };
int rc;
- hpriv = ahci_platform_get_resources(pdev);
+ hpriv = ahci_platform_get_resources(pdev
, 0
);
if (IS_ERR(hpriv))
return PTR_ERR(hpriv);