diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-06 00:35:48 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-06 00:35:48 +0200 |
| commit | 1875962377574b4edb7b164001e3e341c25290d5 (patch) | |
| tree | 374a5299403ec21e2d9a66a6548ce876a388b589 /drivers/w1/w1_family.h | |
| parent | Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt (diff) | |
| parent | ARM: mach-shmobile: Add compilation support for dtbs using 'make dtbs' (diff) | |
| download | linux-1875962377574b4edb7b164001e3e341c25290d5.tar.xz linux-1875962377574b4edb7b164001e3e341c25290d5.zip | |
Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
* 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: mach-shmobile: Add compilation support for dtbs using 'make dtbs'
+ sync to 3.6-rc3
Diffstat (limited to 'drivers/w1/w1_family.h')
| -rw-r--r-- | drivers/w1/w1_family.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h index b00ada44a89b..a1f0ce151d53 100644 --- a/drivers/w1/w1_family.h +++ b/drivers/w1/w1_family.h @@ -39,6 +39,7 @@ #define W1_EEPROM_DS2431 0x2D #define W1_FAMILY_DS2760 0x30 #define W1_FAMILY_DS2780 0x32 +#define W1_THERM_DS1825 0x3B #define W1_FAMILY_DS2781 0x3D #define W1_THERM_DS28EA00 0x42 |