Merge branches 'x86-cleanups-for-linus' and 'x86-cpufeature-for-linus' of git://git...

[~andy/linux] / drivers / w1 / slaves / w1_ds2780.h

diff --git a/drivers/w1/slaves/w1_ds2780.h b/drivers/w1/slaves/w1_ds2780.h
index 7373793650216cca9eed315cf9875c40863aa726..a1fba79eb1b54ea990dc9cf6923452e482a6e3e2 100644 (file)
--- a/drivers/w1/slaves/w1_ds2780.h
+++ b/drivers/w1/slaves/w1_ds2780.h
@@ -124,8 +124,6 @@
 
 extern int w1_ds2780_io(struct device *dev, char *buf, int addr, size_t count,
                        int io);
-extern int w1_ds2780_io_nolock(struct device *dev, char *buf, int addr,
-                       size_t count, int io);
 extern int w1_ds2780_eeprom_cmd(struct device *dev, int addr, int cmd);
 
 #endif /* !_W1_DS2780_H */