From 01ee577a2534403b26ae23e1719ddf22d0448491 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 29 Apr 2013 16:21:06 -0700 Subject: 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 Cc: Roman Fietze Cc: Jon Smirl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/rtc/rtc-isl12022.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/rtc') 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); -- cgit v1.2.3