summaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1_family.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-01-14 12:09:49 -0700
committerGrant Likely <grant.likely@secretlab.ca>2011-01-14 12:09:49 -0700
commit42a9fa9957e369240936891c9a521ab671eed4e7 (patch)
tree7a9367594a367085c6a4a4433f687ec5c8dac8b7 /drivers/w1/w1_family.h
parent5f35765d836befebdfabf745fdbf2e070c887fac (diff)
parentc289ef41431144a538b5fb5f94fc83c81b3020e2 (diff)
downloadblackbird-op-linux-42a9fa9957e369240936891c9a521ab671eed4e7.tar.gz
blackbird-op-linux-42a9fa9957e369240936891c9a521ab671eed4e7.zip
Merge branch 'devicetree/next' into spi/next
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 3ca1b9298f21..f3b636d7cafe 100644
--- a/drivers/w1/w1_family.h
+++ b/drivers/w1/w1_family.h
@@ -30,6 +30,7 @@
#define W1_FAMILY_SMEM_01 0x01
#define W1_FAMILY_SMEM_81 0x81
#define W1_THERM_DS18S20 0x10
+#define W1_COUNTER_DS2423 0x1D
#define W1_THERM_DS1822 0x22
#define W1_EEPROM_DS2433 0x23
#define W1_THERM_DS18B20 0x28
OpenPOWER on IntegriCloud