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 commit 'upstream/master'
[pandora-kernel.git]
/
drivers
/
ata
/
ahci.c
diff --git
a/drivers/ata/ahci.c
b/drivers/ata/ahci.c
index
dc7596f
..
ef3e552
100644
(file)
--- a/
drivers/ata/ahci.c
+++ b/
drivers/ata/ahci.c
@@
-1273,7
+1273,7
@@
static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state,
void __iomem *mmio = ap->host->iomap[AHCI_PCI_BAR];
u32 em_ctl;
u32 message[] = {0, 0};
- unsigned
int
flags;
+ unsigned
long
flags;
int pmp;
struct ahci_em_priv *emp;