git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
w1
/
slaves
/
w1_smem.c
diff --git
a/drivers/w1/slaves/w1_smem.c
b/drivers/w1/slaves/w1_smem.c
index
c6d3be5
..
cc8c02e
100644
(file)
--- a/
drivers/w1/slaves/w1_smem.c
+++ b/
drivers/w1/slaves/w1_smem.c
@@
-28,7
+28,6
@@
#include <linux/types.h>
#include "../w1.h"
-#include "../w1_io.h"
#include "../w1_int.h"
#include "../w1_family.h"