--- a/drivers/input/keyboard/omap-twl4030keypad.c	2008-05-26 10:14:23.000000000 -0700
+++ b/drivers/input/keyboard/omap-twl4030keypad.c	2008-07-17 20:23:12.000000000 -0700
@@ -43,7 +43,12 @@
 #define OMAP_TWL4030KP_LOG_LEVEL	0
 
 #define KEY(col, row, val)	(((col) << 28) | ((row) << 24) | (val))
+
+#ifdef CONFIG_MACH_OMAP_3430LABRADOR
+#define NUM_ROWS		6
+#else
 #define NUM_ROWS		5
+#endif
 #define NUM_COLS		6
 
 #define ROW_MASK		((1<<NUM_ROWS)-1)
@@ -61,6 +66,14 @@
 	{"S8", "S9", "S10", "S11", "S12", "S25"},
 	{"S13", "S14", "S15", "S16", "S17", "S26"},
 	{"S18", "S19", "S20", "S21", "S22", "S27"},
+#ifdef CONFIG_MACH_OMAP_3430LABRADOR
+	/* Labrador uses KBR5/KBC5 for the volume down switch, so I had to add
+	   this entire row just for that switch.  Not sure if any of the other
+	   keys on this new row are actually used, and I just gave them
+	   dummy names for now.
+	*/
+	{"SA", "SB", "SC", "SD", "SE", "S22-d"},
+#endif
 };
 
 #ifdef CONFIG_MACH_OMAP_3430LABRADOR