diff options
author | 2013-08-15 11:11:45 -0700 | |
---|---|---|
committer | 2013-08-15 11:11:45 -0700 | |
commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /drivers/rtc/rtc-max8907.c | |
parent | ceph: Remove bogus check in invalidatepage (diff) | |
parent | Merge branch 'akpm' (patches from Andrew Morton) (diff) | |
download | wireguard-linux-ee3e542fec6e69bc9fb668698889a37d93950ddf.tar.xz wireguard-linux-ee3e542fec6e69bc9fb668698889a37d93950ddf.zip |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'drivers/rtc/rtc-max8907.c')
-rw-r--r-- | drivers/rtc/rtc-max8907.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-max8907.c b/drivers/rtc/rtc-max8907.c index 86afb797125d..8e45b3c4aa2f 100644 --- a/drivers/rtc/rtc-max8907.c +++ b/drivers/rtc/rtc-max8907.c @@ -213,18 +213,12 @@ static int max8907_rtc_probe(struct platform_device *pdev) return ret; } -static int max8907_rtc_remove(struct platform_device *pdev) -{ - return 0; -} - static struct platform_driver max8907_rtc_driver = { .driver = { .name = "max8907-rtc", .owner = THIS_MODULE, }, .probe = max8907_rtc_probe, - .remove = max8907_rtc_remove, }; module_platform_driver(max8907_rtc_driver); |