summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/iic.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-08-25 09:12:35 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-08-25 09:12:35 +0000
commitc7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch)
tree3682407a599b8f9f03fc096298134cafba1c9b2f /arch/arm/kernel/iic.c
parent1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff)
o Merge with Linux 2.1.116.
o New Newport console code. o New G364 console code.
Diffstat (limited to 'arch/arm/kernel/iic.c')
-rw-r--r--arch/arm/kernel/iic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/iic.c b/arch/arm/kernel/iic.c
index 10a25e01b..6eb0122e8 100644
--- a/arch/arm/kernel/iic.c
+++ b/arch/arm/kernel/iic.c
@@ -6,8 +6,9 @@
* IIC is used to get the current time from the CMOS rtc.
*/
+#include <linux/delay.h>
+
#include <asm/system.h>
-#include <asm/delay.h>
#include <asm/io.h>
#include <asm/hardware.h>