diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-11 23:37:45 +0200 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-11 23:37:45 +0200 |
commit | ecdf94da6f91310d08081e05db78a6c997b44e4b (patch) | |
tree | 0528ddc7e2b34046b3bd98dedf89ca7fee40c1ae /drivers/hwmon/tmp401.c | |
parent | Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kge... (diff) | |
parent | Linux 4.1-rc6 (diff) | |
download | linux-ecdf94da6f91310d08081e05db78a6c997b44e4b.tar.xz linux-ecdf94da6f91310d08081e05db78a6c997b44e4b.zip |
Merge tag 'v4.1-rc6' into next/dt
Linux 4.1-rc6
Conflicts:
arch/arm/boot/dts/zynq-7000.dtsi
Resolution summary:
Mainline had an earlier version of the commit, resolve in favor of the
newer patch in next/dt branch.
Diffstat (limited to 'drivers/hwmon/tmp401.c')
-rw-r--r-- | drivers/hwmon/tmp401.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/tmp401.c b/drivers/hwmon/tmp401.c index 99664ebc738d..ccf4cffe0ee1 100644 --- a/drivers/hwmon/tmp401.c +++ b/drivers/hwmon/tmp401.c @@ -44,7 +44,7 @@ #include <linux/sysfs.h> /* Addresses to scan */ -static const unsigned short normal_i2c[] = { 0x37, 0x48, 0x49, 0x4a, 0x4c, 0x4d, +static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4c, 0x4d, 0x4e, 0x4f, I2C_CLIENT_END }; enum chips { tmp401, tmp411, tmp431, tmp432, tmp435 }; |