diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 05:37:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 05:37:46 -0400 |
| commit | d59fdcf2ac501de99c3dfb452af5e254d4342886 (patch) | |
| tree | ad5e2efd6f8aacf2a08b1ed8a54ddf96642e83f3 /drivers/rtc/rtc-fm3130.c | |
| parent | 2387ce57a8167490d3b34a7e1ffa9a64a1a76244 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into x86/core
Diffstat (limited to 'drivers/rtc/rtc-fm3130.c')
| -rw-r--r-- | drivers/rtc/rtc-fm3130.c | 2 |
1 files changed, 1 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 { | |||
| 55 | int alarm; | 55 | int alarm; |
| 56 | }; | 56 | }; |
| 57 | static const struct i2c_device_id fm3130_id[] = { | 57 | static const struct i2c_device_id fm3130_id[] = { |
| 58 | { "fm3130-rtc", 0 }, | 58 | { "fm3130", 0 }, |
| 59 | { } | 59 | { } |
| 60 | }; | 60 | }; |
| 61 | MODULE_DEVICE_TABLE(i2c, fm3130_id); | 61 | MODULE_DEVICE_TABLE(i2c, fm3130_id); |