From: Jason Cooper <jason@lakedaemon.net>
Date: Mon, 19 Aug 2013 21:28:55 +0000 (+0000)
Subject: Merge branch 'mvebu/defconfig' into for-next
X-Git-Tag: next-20130822~13^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2a7f9453d45a72aeb2c222d0167f76344407e8d0;p=karo-tx-linux.git

Merge branch 'mvebu/defconfig' into for-next
---

2a7f9453d45a72aeb2c222d0167f76344407e8d0
diff --cc arch/arm/configs/kirkwood_defconfig
index e3f667a2e10e,4f2bf736335e..0ae0eaebf6b2
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@@ -69,8 -101,10 +70,9 @@@ CONFIG_ATA=
  CONFIG_SATA_AHCI=y
  CONFIG_SATA_MV=y
  CONFIG_NETDEVICES=y
 -CONFIG_MII=y
  CONFIG_NET_DSA_MV88E6123_61_65=y
  CONFIG_MV643XX_ETH=y
+ CONFIG_R8169=y
  CONFIG_MARVELL_PHY=y
  CONFIG_LIBERTAS=y
  CONFIG_LIBERTAS_SDIO=y
@@@ -91,8 -125,12 +93,11 @@@ CONFIG_I2C_MV64XXX=
  CONFIG_SPI=y
  CONFIG_SPI_ORION=y
  CONFIG_GPIO_SYSFS=y
- # CONFIG_HWMON is not set
+ CONFIG_SENSORS_ADT7475=y
+ CONFIG_SENSORS_LM63=y
+ CONFIG_SENSORS_LM75=y
+ CONFIG_SENSORS_LM85=y
  CONFIG_THERMAL=y
 -CONFIG_KIRKWOOD_THERMAL=y
  CONFIG_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
  CONFIG_HID_DRAGONRISE=y