diff --git a/[refs] b/[refs]
index a7209b135aad..2413aa5b62b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54d5710058ebe34451f4ab1d73d86cd8214897b7
+refs/heads/master: e3b1ceedf7adc4adfc989ee78a30fca7b62480b5
diff --git a/trunk/arch/arm/mach-pxa/z2.c b/trunk/arch/arm/mach-pxa/z2.c
index 3ab73f3079a0..d9322ddad8d8 100644
--- a/trunk/arch/arm/mach-pxa/z2.c
+++ b/trunk/arch/arm/mach-pxa/z2.c
@@ -436,12 +436,12 @@ static struct gpio_keys_button z2_pxa_buttons[] = {
 		.type		= EV_KEY,
 	},
 	{
-		.code		= KEY_CLOSE,
+		.code		= SW_LID,
 		.gpio		= GPIO98_ZIPITZ2_LID_BUTTON,
-		.active_low	= 0,
-		.desc		= "Lid Button",
-		.wakeup		= 0
-		.type		= EV_KEY,
+		.active_low	= 1,
+		.desc		= "Lid Switch",
+		.wakeup		= 0,
+		.type		= EV_SW,
 	},
 };