diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 13:13:55 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 13:13:55 -0700 |
| commit | 404c3bc30cb1361e1b3533643326ab472d24a618 (patch) | |
| tree | 156cc9032c8aee17167d926c5bdae009ba8f36d2 /drivers/macintosh/ams/ams-i2c.c | |
| parent | Input: wacom - TPC2FG doesn't store touch id for slots (diff) | |
| parent | Linux 3.5-rc5 (diff) | |
| download | linux-dev-404c3bc30cb1361e1b3533643326ab472d24a618.tar.xz linux-dev-404c3bc30cb1361e1b3533643326ab472d24a618.zip | |
Merge commit 'v3.5-rc5' into next
Diffstat (limited to 'drivers/macintosh/ams/ams-i2c.c')
| -rw-r--r-- | drivers/macintosh/ams/ams-i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/ams/ams-i2c.c b/drivers/macintosh/ams/ams-i2c.c index abeecd27b484..978eda8d6678 100644 --- a/drivers/macintosh/ams/ams-i2c.c +++ b/drivers/macintosh/ams/ams-i2c.c @@ -65,7 +65,7 @@ static int ams_i2c_probe(struct i2c_client *client, static int ams_i2c_remove(struct i2c_client *client); static const struct i2c_device_id ams_id[] = { - { "ams", 0 }, + { "MAC,accelerometer_1", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, ams_id); |