diff --git a/[refs] b/[refs]
index 221a6bf0525b..7d2d7c1d5435 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f87bd330edf06fd49b3fbc368d90fb180375f2a2
+refs/heads/master: 93082f0b15841b8926c38ef224d0e6f720000635
diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c
index dc7596f028b6..ef3e5522e1a4 100644
--- a/trunk/drivers/ata/ahci.c
+++ b/trunk/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;