Merge branch 'for-np' of git://git.wormnet.eu/alex/ts78xx into orion/master

diff --combined arch/arm/configs/orion5x_defconfig
index a8ee6984a09ecb2e9e3a19f0105dec3e371e4de7,45dcd086fee127873b33d9f5da072f7d0760f5ce..a34ea6b2cc517fac2b96b2f319681e3e014f23a9
--- 1/arch/arm/configs/orion5x_defconfig
--- 2/arch/arm/configs/orion5x_defconfig
+++ b/arch/arm/configs/orion5x_defconfig
@@@ -886,8 -886,8 +886,8 @@@ CONFIG_I2C_MV64XXX=
  # Miscellaneous I2C Chip support
  #
  # CONFIG_DS1682 is not set
 -# CONFIG_AT24 is not set
 -# CONFIG_SENSORS_EEPROM is not set
 +# CONFIG_EEPROM_AT24 is not set
 +# CONFIG_EEPROM_LEGACY is not set
  # CONFIG_SENSORS_PCF8574 is not set
  # CONFIG_PCF8575 is not set
  # CONFIG_SENSORS_PCA9539 is not set
@@@ -1177,7 -1177,7 +1177,7 @@@ CONFIG_RTC_DRV_S35390A=
  # CONFIG_RTC_DRV_DS1553 is not set
  # CONFIG_RTC_DRV_DS1742 is not set
  # CONFIG_RTC_DRV_STK17TA8 is not set
- # CONFIG_RTC_DRV_M48T86 is not set
+ CONFIG_RTC_DRV_M48T86=y
  # CONFIG_RTC_DRV_M48T59 is not set
  # CONFIG_RTC_DRV_V3020 is not set