diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:48 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-07-11 08:15:55 -0400 |
| commit | b7e9c223be8ce335e30f2cf6ba588e6a4092275c (patch) | |
| tree | 2d1e3b75606abc18df7ad65e51ac3f90cd68b38d /drivers/rtc/rtc-ds1307.c | |
| parent | c172d82500a6cf3c32d1e650722a1055d72ce858 (diff) | |
| parent | e3bbfa78bab125f58b831b5f7f45b5a305091d72 (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
Diffstat (limited to 'drivers/rtc/rtc-ds1307.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1307.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 4724ba3acf1a..b2005b44e4f7 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c | |||
| @@ -149,6 +149,7 @@ static const struct i2c_device_id ds1307_id[] = { | |||
| 149 | { "ds1340", ds_1340 }, | 149 | { "ds1340", ds_1340 }, |
| 150 | { "ds3231", ds_3231 }, | 150 | { "ds3231", ds_3231 }, |
| 151 | { "m41t00", m41t00 }, | 151 | { "m41t00", m41t00 }, |
| 152 | { "pt7c4338", ds_1307 }, | ||
| 152 | { "rx8025", rx_8025 }, | 153 | { "rx8025", rx_8025 }, |
| 153 | { } | 154 | { } |
| 154 | }; | 155 | }; |