From 23ba8bf00ad3671ac402fb34398498c84a6b9318 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 30 Nov 2005 23:47:05 -0500
Subject: [PATCH] --- yaml --- r: 20028 b: refs/heads/master c:
 164006da316a22eaaa9fbe36f835a01606436c66 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/wan/pci200syn.c    | 2 +-
 trunk/drivers/net/wan/wanxl.c        | 2 +-
 trunk/drivers/scsi/aacraid/commsup.c | 2 +-
 trunk/sound/oss/emu10k1/recmgr.c     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2c91b159cde2..909b68ce69c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b8623545b42c03eb92e51b28c84acf4b8ba00a3
+refs/heads/master: 164006da316a22eaaa9fbe36f835a01606436c66
diff --git a/trunk/drivers/net/wan/pci200syn.c b/trunk/drivers/net/wan/pci200syn.c
index 8dea07b47999..eba8e5cfacc2 100644
--- a/trunk/drivers/net/wan/pci200syn.c
+++ b/trunk/drivers/net/wan/pci200syn.c
@@ -29,7 +29,7 @@
 #include <linux/netdevice.h>
 #include <linux/hdlc.h>
 #include <linux/pci.h>
-#include <asm/delay.h>
+#include <linux/delay.h>
 #include <asm/io.h>
 
 #include "hd64572.h"
diff --git a/trunk/drivers/net/wan/wanxl.c b/trunk/drivers/net/wan/wanxl.c
index 9c1e10602f2b..9d3b51c3ef54 100644
--- a/trunk/drivers/net/wan/wanxl.c
+++ b/trunk/drivers/net/wan/wanxl.c
@@ -27,8 +27,8 @@
 #include <linux/hdlc.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
+#include <linux/delay.h>
 #include <asm/io.h>
-#include <asm/delay.h>
 
 #include "wanxl.h"
 
diff --git a/trunk/drivers/scsi/aacraid/commsup.c b/trunk/drivers/scsi/aacraid/commsup.c
index 38d6d00fb0fc..014cc8d54a9f 100644
--- a/trunk/drivers/scsi/aacraid/commsup.c
+++ b/trunk/drivers/scsi/aacraid/commsup.c
@@ -38,10 +38,10 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
+#include <linux/delay.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
 #include <asm/semaphore.h>
-#include <asm/delay.h>
 
 #include "aacraid.h"
 
diff --git a/trunk/sound/oss/emu10k1/recmgr.c b/trunk/sound/oss/emu10k1/recmgr.c
index 67c3fd04cfdd..2ce56180e7d4 100644
--- a/trunk/sound/oss/emu10k1/recmgr.c
+++ b/trunk/sound/oss/emu10k1/recmgr.c
@@ -29,7 +29,7 @@
  **********************************************************************
  */
 
-#include <asm/delay.h>
+#include <linux/delay.h>
 #include "8010.h"
 #include "recmgr.h"