diff --git a/[refs] b/[refs]
index 2e1d3b55c6cc..4f8eb412b5be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7b9837c7749bf3333151a7d060d239caff1569d
+refs/heads/master: d60cd5f16b5af62672209eddd64f70be3f68d17b
diff --git a/trunk/arch/arm/mach-shmobile/setup-r8a7779.c b/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
index 10031fef074a..042df35e71a0 100644
--- a/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -331,7 +331,7 @@ static struct resource sata_resources[] = {
 		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {
-		.start	= gic_spi(100),
+		.start	= gic_iid(0x84),
 		.flags	= IORESOURCE_IRQ,
 	},
 };