1 files changed, 2 insertions, 5 deletions

diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index d8237c341995..24d6ca04de86 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -24,14 +24,13 @@
 #include <linux/capability.h>
 #include <linux/circ_buf.h>
 #include <linux/console.h>
+#include <linux/irq.h>
 #include <linux/module.h>
 #include <linux/serial.h>
 #include <linux/sysrq.h>
+#include <linux/uaccess.h>
 
-#include <asm/irq.h>
 #include <asm/hpsim.h>
-#include <asm/hw_irq.h>
-#include <asm/uaccess.h>
 
 #include "hpsim_ssc.h"
 
@@ -57,8 +56,6 @@ struct tty_driver *hp_simserial_driver;
 
 static struct console *console;
 
-extern struct console *console_drivers; /* from kernel/printk.c */
-
 static void receive_chars(struct tty_struct *tty)
 {
         unsigned char ch;