diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-27 19:30:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-27 19:30:13 +0100 |
| commit | e4e4146ec5a0a4221eee051365422ad70cddb673 (patch) | |
| tree | 96e99d23ebc31fad84e40cb323dfe33b0e6af6d0 /arch/arm/mach-orion5x/dns323-setup.c | |
| parent | 9abc6461a3802702ada88cbac1fed045dbd9b466 (diff) | |
| parent | 8e05de88cf5a8ab225697ba12d5f19ec594169ef (diff) | |
| download | linux-e4e4146ec5a0a4221eee051365422ad70cddb673.tar.gz linux-e4e4146ec5a0a4221eee051365422ad70cddb673.tar.bz2 linux-e4e4146ec5a0a4221eee051365422ad70cddb673.zip | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch/arm/mach-orion5x/dns323-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/dns323-setup.c | 6 |
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), }, |