diff --git a/[refs] b/[refs]
index 04984f1c7848..eb35fa6e5203 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c222f5f41fca51a4639d88a940f9283d04ba2c0c
+refs/heads/master: df1a000e767f54a539f4d2d663130d063f5208ea
diff --git a/trunk/arch/m68k/platform/5307/gpio.c b/trunk/arch/m68k/platform/5307/gpio.c
index 5850612b4a38..91d042030657 100644
--- a/trunk/arch/m68k/platform/5307/gpio.c
+++ b/trunk/arch/m68k/platform/5307/gpio.c
@@ -21,21 +21,7 @@
 #include <asm/mcfgpio.h>
 
 static struct mcf_gpio_chip mcf_gpio_chips[] = {
-	{
-		.gpio_chip			= {
-			.label			= "PP",
-			.request		= mcf_gpio_request,
-			.free			= mcf_gpio_free,
-			.direction_input	= mcf_gpio_direction_input,
-			.direction_output	= mcf_gpio_direction_output,
-			.get			= mcf_gpio_get_value,
-			.set			= mcf_gpio_set_value,
-			.ngpio			= 16,
-		},
-		.pddr				= (void __iomem *) MCFSIM_PADDR,
-		.podr				= (void __iomem *) MCFSIM_PADAT,
-		.ppdr				= (void __iomem *) MCFSIM_PADAT,
-	},
+	MCFGPS(PP, 0, 16, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT),
 };
 
 static int __init mcf_gpio_init(void)