diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-17 05:19:55 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-17 05:19:55 +0400 |
| commit | 28a78e46f04ac5c4952533f2938a18699f207004 (patch) | |
| tree | 2991c5cea8d7f912abbe59e315fd1ed03febe45c /drivers/w1/slaves/w1_ds2781.h | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| parent | b0d1f807f340e91b27aa721f6474956af11571da (diff) | |
| download | linux-28a78e46f04ac5c4952533f2938a18699f207004.tar.xz | |
Merge 3.5-rc7 into driver-core-next
This pulls in the printk fixes to the driver-core-next branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1/slaves/w1_ds2781.h')
| -rw-r--r-- | drivers/w1/slaves/w1_ds2781.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/w1/slaves/w1_ds2781.h b/drivers/w1/slaves/w1_ds2781.h index 82bc66497b43..557dfb0b4f64 100644 --- a/drivers/w1/slaves/w1_ds2781.h +++ b/drivers/w1/slaves/w1_ds2781.h @@ -129,8 +129,6 @@ extern int w1_ds2781_io(struct device *dev, char *buf, int addr, size_t count, int io); -extern int w1_ds2781_io_nolock(struct device *dev, char *buf, int addr, - size_t count, int io); extern int w1_ds2781_eeprom_cmd(struct device *dev, int addr, int cmd); #endif /* !_W1_DS2781_H */ |