aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/rtc/rtc-em3027.c
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-08-15 11:11:45 -0700
committerSage Weil <sage@inktank.com>2013-08-15 11:11:45 -0700
commitee3e542fec6e69bc9fb668698889a37d93950ddf (patch)
treee74ee766a4764769ef1d3d45d266b4dea64101d3 /drivers/rtc/rtc-em3027.c
parentceph: Remove bogus check in invalidatepage (diff)
parentMerge branch 'akpm' (patches from Andrew Morton) (diff)
downloadwireguard-linux-ee3e542fec6e69bc9fb668698889a37d93950ddf.tar.xz
wireguard-linux-ee3e542fec6e69bc9fb668698889a37d93950ddf.zip
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'drivers/rtc/rtc-em3027.c')
-rw-r--r--drivers/rtc/rtc-em3027.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-em3027.c b/drivers/rtc/rtc-em3027.c
index 3f9eb57d0486..fccf36699245 100644
--- a/drivers/rtc/rtc-em3027.c
+++ b/drivers/rtc/rtc-em3027.c
@@ -131,11 +131,6 @@ static int em3027_probe(struct i2c_client *client,
return 0;
}
-static int em3027_remove(struct i2c_client *client)
-{
- return 0;
-}
-
static struct i2c_device_id em3027_id[] = {
{ "em3027", 0 },
{ }
@@ -146,7 +141,6 @@ static struct i2c_driver em3027_driver = {
.name = "rtc-em3027",
},
.probe = &em3027_probe,
- .remove = &em3027_remove,
.id_table = em3027_id,
};