diff --git a/[refs] b/[refs]
index 38ffd40e04a8..fafdba455568 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c269d4efaab0847947e87df7a5a8b6c5817d9f1d
+refs/heads/master: 6f84758edbc102c18fc3eb48e2b3ecb2b42f690b
diff --git a/trunk/arch/m68k/platform/5206/gpio.c b/trunk/arch/m68k/platform/5206/gpio.c
index b9ab4a120f28..200a7acf0842 100644
--- a/trunk/arch/m68k/platform/5206/gpio.c
+++ b/trunk/arch/m68k/platform/5206/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			= 8,
-		},
-		.pddr				= (void __iomem *) MCFSIM_PADDR,
-		.podr				= (void __iomem *) MCFSIM_PADAT,
-		.ppdr				= (void __iomem *) MCFSIM_PADAT,
-	},
+	MCFGPS(PP, 0, 8, MCFSIM_PADDR, MCFSIM_PADAT, MCFSIM_PADAT),
 };
 
 static int __init mcf_gpio_init(void)