Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6] / arch / i386 / kernel / i8253.c

diff --git a/arch/i386/kernel/i8253.c b/arch/i386/kernel/i8253.c
index bde249dda94d583a5375c99250de7dd9e19cb9a9..6d839f2f1b1a6e1abca311760ac89f6a6deec6af 100644 (file)
--- a/arch/i386/kernel/i8253.c
+++ b/arch/i386/kernel/i8253.c
@@ -13,8 +13,7 @@
 #include <asm/delay.h>
 #include <asm/i8253.h>
 #include <asm/io.h>
-
-#include "io_ports.h"
+#include <asm/timer.h>
 
 DEFINE_SPINLOCK(i8253_lock);
 EXPORT_SYMBOL(i8253_lock);