]> err.no Git - linux-2.6/commitdiff
[ARM] Orion: activate lm75 driver on DNS-323
authorMartin Michlmayr <tbm@cyrius.com>
Tue, 12 Aug 2008 09:50:14 +0000 (12:50 +0300)
committerNicolas Pitre <nico@cam.org>
Fri, 22 Aug 2008 02:15:17 +0000 (22:15 -0400)
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>
arch/arm/configs/orion5x_defconfig
arch/arm/mach-orion5x/dns323-setup.c

index 1464ffe71717ff10a41b56e9753affacd3a89596..113a4557276342fb7daa58a6e3e47af49f5a53ab 100644 (file)
@@ -884,7 +884,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM75 is not set
+CONFIG_SENSORS_LM75=y
 # CONFIG_SENSORS_LM77 is not set
 # CONFIG_SENSORS_LM78 is not set
 # CONFIG_SENSORS_LM80 is not set
index 1a1d84b80a6521bed1de34ded745db7a643f0ac8..b38c65ccfb154b63b584b310ca1539e4c886b08f 100644 (file)
@@ -245,12 +245,8 @@ static struct orion5x_mpp_mode dns323_mpp_modes[] __initdata = {
 static struct i2c_board_info __initdata dns323_i2c_devices[] = {
        {
                I2C_BOARD_INFO("g760a", 0x3e),
-#if 0
-       /* this entry requires the new-style driver model lm75 driver,
-        * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */
        }, {
-               I2C_BOARD_INFO("g751", 0x48),
-#endif
+               I2C_BOARD_INFO("lm75", 0x48),
        }, {
                I2C_BOARD_INFO("m41t80", 0x68),
        },