diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 21:19:55 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 21:19:55 -0400 |
| commit | 28a78e46f04ac5c4952533f2938a18699f207004 (patch) | |
| tree | 2991c5cea8d7f912abbe59e315fd1ed03febe45c /drivers/w1/w1_family.h | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| parent | b0d1f807f340e91b27aa721f6474956af11571da (diff) | |
Merge 3.5-rc7 into driver-core-next
This pulls in the printk fixes to the driver-core-next branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 874aeb05011b..b00ada44a89b 100644 --- a/drivers/w1/w1_family.h +++ b/drivers/w1/w1_family.h | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #define W1_FAMILY_SMEM_01 0x01 | 30 | #define W1_FAMILY_SMEM_01 0x01 |
| 31 | #define W1_FAMILY_SMEM_81 0x81 | 31 | #define W1_FAMILY_SMEM_81 0x81 |
| 32 | #define W1_THERM_DS18S20 0x10 | 32 | #define W1_THERM_DS18S20 0x10 |
| 33 | #define W1_FAMILY_DS28E04 0x1C | ||
| 33 | #define W1_COUNTER_DS2423 0x1D | 34 | #define W1_COUNTER_DS2423 0x1D |
| 34 | #define W1_THERM_DS1822 0x22 | 35 | #define W1_THERM_DS1822 0x22 |
| 35 | #define W1_EEPROM_DS2433 0x23 | 36 | #define W1_EEPROM_DS2433 0x23 |