[PATCH] Dallas 1-wire delay.h

Dallas 1-wire: never include <asm/delay.h> directly

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/w1/matrox_w1.c b/drivers/w1/matrox_w1.c
index 55b1faf013093d18252a4e0d41447ee1032ba3f4..bde17782e66f56eb62c415ae112bc0e5e79ad264 100644 (file)
--- a/drivers/w1/matrox_w1.c
+++ b/drivers/w1/matrox_w1.c
@@ -22,8 +22,8 @@
 #include <asm/atomic.h>
 #include <asm/types.h>
 #include <asm/io.h>
-#include <asm/delay.h>
 
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/list.h>

diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index d956f5e64ade08633d76f156d145134b44bfaca3..4f52422aed3597b299a7e1f00037e6ca85662bc1 100644 (file)
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -20,8 +20,8 @@
  */
 
 #include <asm/atomic.h>
-#include <asm/delay.h>
 
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>

diff --git a/drivers/w1/w1_io.c b/drivers/w1/w1_io.c
index 75d538b74dd433ec66c0fe674d1d235c6d7a9423..9baacee68f3699f7ece96b5491dd0a454f240179 100644 (file)
--- a/drivers/w1/w1_io.c
+++ b/drivers/w1/w1_io.c
@@ -20,8 +20,8 @@
  */
 
 #include <asm/io.h>
-#include <asm/delay.h>
 
+#include <linux/delay.h>
 #include <linux/moduleparam.h>
 
 #include "w1.h"