From 88a54731ee9a283a7ffa8b53cd0c14dc227e0629 Mon Sep 17 00:00:00 2001 From: Benson Leung Date: Fri, 1 Feb 2013 14:34:43 -0800 Subject: [PATCH] --- yaml --- r: 360557 b: refs/heads/master c: 6e71094d98b54c2db09ef6af33b67bdece9d4ebe h: refs/heads/master i: 360555: 48ff9a509a9d5eeaa203ab191544244a8c8e1627 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/chromeos_laptop.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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",