diff --git a/arch/arm/configs/omap3_devkit8000_android_defconfig b/arch/arm/configs/omap3_devkit8000_android_defconfig
index bef1acd..24dcb28 100644
--- a/arch/arm/configs/omap3_devkit8000_android_defconfig
+++ b/arch/arm/configs/omap3_devkit8000_android_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29-omap1
-# Mon Dec 14 17:13:08 2009
+# Thu Dec 17 03:03:24 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -685,7 +685,7 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_KEYBOARD_TWL4030=y
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
@@ -708,7 +708,17 @@ CONFIG_ADS_SCALED_EV=y
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_TWL4030_PWRBUTTON is not set
+CONFIG_INPUT_UINPUT=y
+# CONFIG_INPUT_GPIO is not set
+# CONFIG_INPUT_KEYCHORD is not set
 
 #
 # Hardware I/O ports
diff --git a/arch/arm/mach-omap2/board-omap3devkit8000.c b/arch/arm/mach-omap2/board-omap3devkit8000.c
index e86d254..ec17311 100644
--- a/arch/arm/mach-omap2/board-omap3devkit8000.c
+++ b/arch/arm/mach-omap2/board-omap3devkit8000.c
@@ -462,9 +462,11 @@ static struct platform_device leds_gpio = {
 
 static struct gpio_keys_button gpio_buttons[] = {
 	{
-		.code			= BTN_EXTRA,
+//		.code			= BTN_EXTRA,
+		.code			= KEY_ESC,
 		.gpio			= 26,
 		.desc			= "user",
+		.active_low		= 1,
 		.wakeup			= 1,
 	},
 };