diff --git a/[refs] b/[refs]
index d6750473b64f..d06da65fec54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2740e1bd528771dea9003a1c85f7f8d051c2808d
+refs/heads/master: 6e71094d98b54c2db09ef6af33b67bdece9d4ebe
diff --git a/trunk/drivers/platform/x86/chromeos_laptop.c b/trunk/drivers/platform/x86/chromeos_laptop.c
index a8329c3a9d0d..6440d2250ba9 100644
--- a/trunk/drivers/platform/x86/chromeos_laptop.c
+++ b/trunk/drivers/platform/x86/chromeos_laptop.c
@@ -145,7 +145,7 @@ static struct i2c_client __init *add_smbus_device(const char *name,
 				       addr_list);
 }
 
-static int __init setup_lumpy_tp(const struct dmi_system_id *id)
+static int __init setup_cyapa_smbus_tp(const struct dmi_system_id *id)
 {
 	/* add cyapa touchpad on smbus */
 	tp = add_smbus_device("trackpad", &cyapa_device);
@@ -166,7 +166,7 @@ static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
 			DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "Lumpy"),
 		},
-		.callback = setup_lumpy_tp,
+		.callback = setup_cyapa_smbus_tp,
 	},
 	{
 		.ident = "Samsung Series 5 550 - Light Sensor",