Merge branch 'davinci' into for-2.6.32

[karo-tx-linux.git] / drivers / w1 / slaves / w1_smem.c

diff --git a/drivers/w1/slaves/w1_smem.c b/drivers/w1/slaves/w1_smem.c
index c6d3be54f94c57fca71db8d529bd02fd370cdf93..cc8c02e92593f813c8c94961f213ebb288427c9b 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"