Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[cascardo/linux.git] / drivers / rtc / rtc-fm3130.c

diff --git a/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c
index 2835fb6..83c3b30 100644 (file)
--- a/drivers/rtc/rtc-fm3130.c
+++ b/drivers/rtc/rtc-fm3130.c
@@ -47,7 +47,7 @@
 
 struct fm3130 {
        u8                      reg_addr_time;
-       u8                      reg_addr_alarm;
+       u8                      reg_addr_alarm;
        u8                      regs[15];
        struct i2c_msg          msg[4];
        struct i2c_client       *client;
@@ -520,18 +520,12 @@ exit_free:
        return err;
 }
 
-static int fm3130_remove(struct i2c_client *client)
-{
-       return 0;
-}
-
 static struct i2c_driver fm3130_driver = {
        .driver = {
                .name   = "rtc-fm3130",
                .owner  = THIS_MODULE,
        },
        .probe          = fm3130_probe,
-       .remove         = fm3130_remove,
        .id_table       = fm3130_id,
 };