Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / w1 / w1.h

diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index f1df5343f4ad4a25ab87f7c1782216f1135eec33..b8189e8f2a5eac43591b988b636252e8935687c6 100644 (file)
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -189,6 +189,7 @@ struct w1_master *w1_search_master_id(u32 id);
 
 u8 w1_triplet(struct w1_master *dev, int bdir);
 void w1_write_8(struct w1_master *, u8);
+u8 w1_read_8(struct w1_master *);
 int w1_reset_bus(struct w1_master *);
 u8 w1_calc_crc8(u8 *, int);
 void w1_write_block(struct w1_master *, const u8 *, int);