aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-04-29 16:21:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 18:28:40 -0700
commit01ee577a2534403b26ae23e1719ddf22d0448491 (patch)
tree55c56d15ddaad42a7369a15fa042e7e033f92e0c
parent3427de92ac70a064098ff843c72ac76c420bb1cb (diff)
downloadlinux-01ee577a2534403b26ae23e1719ddf22d0448491.tar.gz
drivers/rtc/rtc-isl12022.c: Remove rtc8564 from isl12022_id
rtc8564 appears in i2c_device_id table of both rtc-isl12022.c and rtc-pcf8563.c. Commit 8ea9212cbd65 "rtc-pcf8563: add chip id" added the rtc8564 chip entry to pcf8563. isl12022 driver is modified from pcf8563 driver, so this looks like a copy-paste bug. Signed-off-by: Axel Lin <axel.lin@ingics.com> Cc: Roman Fietze <roman.fietze@telemotive.de> Cc: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-isl12022.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c
index 1af0aa5cbd2..a1bbbb8de02 100644
--- a/drivers/rtc/rtc-isl12022.c
+++ b/drivers/rtc/rtc-isl12022.c
@@ -280,7 +280,6 @@ static int isl12022_remove(struct i2c_client *client)
static const struct i2c_device_id isl12022_id[] = {
{ "isl12022", 0 },
- { "rtc8564", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, isl12022_id);