aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2008-08-12 05:50:14 -0400
committerNicolas Pitre <nico@cam.org>2008-08-21 22:15:17 -0400
commitc0fe819baf86979a5801387ccd7d8df0dc2f34e2 (patch)
tree7f8ab57e1e9116eeab4b59e233c8b91875e3636b /arch/arm
parent35228e840acc70b49a2eab4eb308ca3d544efdcf (diff)
[ARM] Orion: activate lm75 driver on DNS-323
The lm75 driver was recently converted to the new-style binding, so now it can be loaded from the DNS-323 support code. Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Tested-by: Tobias Poschwatta <tp@fonz.de> Acked-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/orion5x_defconfig2
-rw-r--r--arch/arm/mach-orion5x/dns323-setup.c6
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig
index 1464ffe71717..113a45572763 100644
--- a/arch/arm/configs/orion5x_defconfig
+++ b/arch/arm/configs/orion5x_defconfig
@@ -884,7 +884,7 @@ CONFIG_HWMON=y
884# CONFIG_SENSORS_GL520SM is not set 884# CONFIG_SENSORS_GL520SM is not set
885# CONFIG_SENSORS_IT87 is not set 885# CONFIG_SENSORS_IT87 is not set
886# CONFIG_SENSORS_LM63 is not set 886# CONFIG_SENSORS_LM63 is not set
887# CONFIG_SENSORS_LM75 is not set 887CONFIG_SENSORS_LM75=y
888# CONFIG_SENSORS_LM77 is not set 888# CONFIG_SENSORS_LM77 is not set
889# CONFIG_SENSORS_LM78 is not set 889# CONFIG_SENSORS_LM78 is not set
890# CONFIG_SENSORS_LM80 is not set 890# CONFIG_SENSORS_LM80 is not set
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 1a1d84b80a65..b38c65ccfb15 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -245,12 +245,8 @@ static struct orion5x_mpp_mode dns323_mpp_modes[] __initdata = {
245static struct i2c_board_info __initdata dns323_i2c_devices[] = { 245static struct i2c_board_info __initdata dns323_i2c_devices[] = {
246 { 246 {
247 I2C_BOARD_INFO("g760a", 0x3e), 247 I2C_BOARD_INFO("g760a", 0x3e),
248#if 0
249 /* this entry requires the new-style driver model lm75 driver,
250 * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */
251 }, { 248 }, {
252 I2C_BOARD_INFO("g751", 0x48), 249 I2C_BOARD_INFO("lm75", 0x48),
253#endif
254 }, { 250 }, {
255 I2C_BOARD_INFO("m41t80", 0x68), 251 I2C_BOARD_INFO("m41t80", 0x68),
256 }, 252 },