]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'rtc/rtc-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 04:07:23 +0000 (15:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 04:07:23 +0000 (15:07 +1100)
1  2 
drivers/rtc/rtc-rx8025.c

diff --combined drivers/rtc/rtc-rx8025.c
index 85df3b4c2521c420e54bf56d38c811bb9f503fe9,17341feadad19f55ce126c4e3c2d2d2c8fe0429b..d89c65ec88119aac7be186bc78892215ed6084bd
@@@ -7,7 -7,7 +7,7 @@@
   * All rights reserved.
   *
   * Modified by fengjh at rising.com.cn
 - * <http://lists.lm-sensors.org/mailman/listinfo/lm-sensors>
 + * <lm-sensors@lm-sensors.org>
   * 2006.11
   *
   * Code cleanup by Sergei Poselenov, <sposelenov@emcraft.com>
@@@ -65,7 -65,6 +65,6 @@@
  
  static const struct i2c_device_id rx8025_id[] = {
        { "rx8025", 0 },
-       { "rv8803", 1 },
        { }
  };
  MODULE_DEVICE_TABLE(i2c, rx8025_id);