From: Geert Uytterhoeven <geert@linux-m68k.org> 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> --- 25-akpm/drivers/w1/matrox_w1.c | 2 +- 25-akpm/drivers/w1/w1.c | 2 +- 25-akpm/drivers/w1/w1_io.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/w1/matrox_w1.c~dallas-1-wire-delayh drivers/w1/matrox_w1.c --- 25/drivers/w1/matrox_w1.c~dallas-1-wire-delayh 2004-07-26 17:28:26.084646704 -0700 +++ 25-akpm/drivers/w1/matrox_w1.c 2004-07-26 17:28:26.091645640 -0700 @@ -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 -puN drivers/w1/w1.c~dallas-1-wire-delayh drivers/w1/w1.c --- 25/drivers/w1/w1.c~dallas-1-wire-delayh 2004-07-26 17:28:26.085646552 -0700 +++ 25-akpm/drivers/w1/w1.c 2004-07-26 17:28:26.091645640 -0700 @@ -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 -puN drivers/w1/w1_io.c~dallas-1-wire-delayh drivers/w1/w1_io.c --- 25/drivers/w1/w1_io.c~dallas-1-wire-delayh 2004-07-26 17:28:26.087646248 -0700 +++ 25-akpm/drivers/w1/w1_io.c 2004-07-26 17:28:26.091645640 -0700 @@ -20,8 +20,8 @@ */ #include <asm/io.h> -#include <asm/delay.h> +#include <linux/delay.h> #include <linux/moduleparam.h> #include "w1.h" _