summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/dns323-setup.c
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2008-08-12 11:50:14 +0200
committerNicolas Pitre <nico@cam.org>2008-08-22 04:15:17 +0200
commitc0fe819baf86979a5801387ccd7d8df0dc2f34e2 (patch)
tree7f8ab57e1e9116eeab4b59e233c8b91875e3636b /arch/arm/mach-orion5x/dns323-setup.c
parent[ARM] Orion: fix MAC detection on QNAP TS-209 and TS-409 (diff)
downloadlinux-c0fe819baf86979a5801387ccd7d8df0dc2f34e2.tar.xz
linux-c0fe819baf86979a5801387ccd7d8df0dc2f34e2.zip
[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/mach-orion5x/dns323-setup.c')
-rw-r--r--arch/arm/mach-orion5x/dns323-setup.c6
1 files changed, 1 insertions, 5 deletions
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 = {
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),
},