diff --git a/[refs] b/[refs]
index d06da65fec54..13bdf3986ea0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e71094d98b54c2db09ef6af33b67bdece9d4ebe
+refs/heads/master: 261f171f571a82c1f990d484c374aa3f7236fe5e
diff --git a/trunk/drivers/platform/x86/chromeos_laptop.c b/trunk/drivers/platform/x86/chromeos_laptop.c
index 6440d2250ba9..9293c66d52c1 100644
--- a/trunk/drivers/platform/x86/chromeos_laptop.c
+++ b/trunk/drivers/platform/x86/chromeos_laptop.c
@@ -176,6 +176,13 @@ static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
 		},
 		.callback = setup_isl29018_als,
 	},
+	{
+		.ident = "Acer C7 Chromebook - Touchpad",
+		.matches = {
+			DMI_MATCH(DMI_PRODUCT_NAME, "Parrot"),
+		},
+		.callback = setup_cyapa_smbus_tp,
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(dmi, chromeos_laptop_dmi_table);