Merge branch 'master'

[linux-2.6] / drivers / w1 / w1_io.h

diff --git a/drivers/w1/w1_io.h b/drivers/w1/w1_io.h
index 327c22ba50d5ee0b29e6ff538c81fee37b456d6d..232860184a29ed62ae4a6166441b2c182cbabd97 100644 (file)
--- a/drivers/w1/w1_io.h
+++ b/drivers/w1/w1_io.h
@@ -26,14 +26,14 @@
 
 void w1_delay(unsigned long);
 u8 w1_touch_bit(struct w1_master *, int);
-void w1_write_bit(struct w1_master *, int);
+u8 w1_triplet(struct w1_master *dev, int bdir);
 void w1_write_8(struct w1_master *, u8);
-u8 w1_read_bit(struct w1_master *);
 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 *, u8 *, int);
+void w1_write_block(struct w1_master *, const u8 *, int);
 u8 w1_read_block(struct w1_master *, u8 *, int);
 void w1_search_devices(struct w1_master *dev, w1_slave_found_callback cb);
+int w1_reset_select_slave(struct w1_slave *sl);
 
 #endif /* __W1_IO_H */