diff --git a/[refs] b/[refs]
index 1fa21ca66138..2ab0607dea41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2a034cf16a1642e647497c70c1cd9c09bf39412
+refs/heads/master: 9223d01b2fdf638a73888ad73a1784fca3454c1e
diff --git a/trunk/drivers/ata/pata_rb532_cf.c b/trunk/drivers/ata/pata_rb532_cf.c
index 2f3b49cc4970..8e3cdef8a25f 100644
--- a/trunk/drivers/ata/pata_rb532_cf.c
+++ b/trunk/drivers/ata/pata_rb532_cf.c
@@ -104,7 +104,7 @@ static void rb532_pata_setup_ports(struct ata_host *ah)
 
 static __devinit int rb532_pata_driver_probe(struct platform_device *pdev)
 {
-	unsigned int irq;
+	int irq;
 	int gpio;
 	struct resource *res;
 	struct ata_host *ah;