diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-13 16:52:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-13 16:52:27 -0400 |
| commit | dbbcfb2211761fa69e831a78119c9288fb87eb9d (patch) | |
| tree | b40b103ed250e287bf3d4790f1c87001cf7cf52f /drivers/rtc/rtc-fm3130.c | |
| parent | b0356cd0e7497252a2c45ecb07b79d931390c8b2 (diff) | |
| parent | 9df2fe986770bc4c76e8fe72c20b71268eec39a7 (diff) | |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
arch/x86/mm/ioremap.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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); |