diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 11:37:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 11:37:46 +0200 |
| commit | d59fdcf2ac501de99c3dfb452af5e254d4342886 (patch) | |
| tree | ad5e2efd6f8aacf2a08b1ed8a54ddf96642e83f3 /drivers/rtc | |
| parent | 2387ce57a8167490d3b34a7e1ffa9a64a1a76244 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into x86/core
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-fm3130.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/rtc-pcf8563.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c index 11644c8fca82..abfdfcbaa059 100644 --- a/drivers/rtc/rtc-fm3130.c +++ b/drivers/rtc/rtc-fm3130.c @@ -55,7 +55,7 @@ struct fm3130 { int alarm; }; static const struct i2c_device_id fm3130_id[] = { - { "fm3130-rtc", 0 }, + { "fm3130", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, fm3130_id); diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c index 0fc4c3630780..748a502a6355 100644 --- a/drivers/rtc/rtc-pcf8563.c +++ b/drivers/rtc/rtc-pcf8563.c @@ -302,6 +302,7 @@ static int pcf8563_remove(struct i2c_client *client) static const struct i2c_device_id pcf8563_id[] = { { "pcf8563", 0 }, + { "rtc8564", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, pcf8563_id); |