summaryrefslogtreecommitdiff
path: root/drivers/rtc/rtc-fm3130.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-14 13:37:46 +0400
committerIngo Molnar <mingo@elte.hu>2008-07-14 13:37:46 +0400
commitd59fdcf2ac501de99c3dfb452af5e254d4342886 (patch)
treead5e2efd6f8aacf2a08b1ed8a54ddf96642e83f3 /drivers/rtc/rtc-fm3130.c
parent2387ce57a8167490d3b34a7e1ffa9a64a1a76244 (diff)
parentbce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff)
downloadlinux-d59fdcf2ac501de99c3dfb452af5e254d4342886.tar.xz
Merge commit 'v2.6.26' into x86/core
Diffstat (limited to 'drivers/rtc/rtc-fm3130.c')
-rw-r--r--drivers/rtc/rtc-fm3130.c2
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 {
int alarm;
};
static const struct i2c_device_id fm3130_id[] = {
- { "fm3130-rtc", 0 },
+ { "fm3130", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, fm3130_id);