summaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1_family.h
diff options
context:
space:
mode:
authorMariusz Bialonczyk <manio@skyboo.net>2013-02-28 02:05:47 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-28 04:10:23 +0100
commit31b4ca3ef9868a247ae311eb23894c228d9b340c (patch)
tree579f87465dafbcfcc50d0d7160245e833d99d10d /drivers/w1/w1_family.h
parentmemstick: move the dereference below the NULL test (diff)
downloadlinux-31b4ca3ef9868a247ae311eb23894c228d9b340c.tar.xz
linux-31b4ca3ef9868a247ae311eb23894c228d9b340c.zip
w1: add support for DS2413 Dual Channel Addressable Switch
Also fixes some whitespace inconsistency in Kconfig and w1_family.h when DS2408 chip support was added. Signed-off-by: Mariusz Bialonczyk <manio@skyboo.net> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/w1/w1_family.h')
-rw-r--r--drivers/w1/w1_family.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h
index a1f0ce151d53..625dd08f775f 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_FAMILY_DS2413 0x3A
#define W1_THERM_DS1825 0x3B
#define W1_FAMILY_DS2781 0x3D
#define W1_THERM_DS28EA00 0x42