Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 360557
b: refs/heads/master
c: 6e71094
h: refs/heads/master
i:
  360555: 48ff9a5
v: v3
  • Loading branch information
Benson Leung authored and Matthew Garrett committed Feb 27, 2013
1 parent 6c86bb7 commit 88a5473
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2740e1bd528771dea9003a1c85f7f8d051c2808d
refs/heads/master: 6e71094d98b54c2db09ef6af33b67bdece9d4ebe
4 changes: 2 additions & 2 deletions trunk/drivers/platform/x86/chromeos_laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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",
Expand Down

0 comments on commit 88a5473

Please sign in to comment.