[ARM] Move AMBA include files to include/linux/amba/

[linux-beck.git] / drivers / serial / amba-pl010.c

diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c
index 978e12437e617df488ccd32352e41a457516961b..48f6e872314bb2a1acf12efc7b003739707d2c9e 100644 (file)
--- a/drivers/serial/amba-pl010.c
+++ b/drivers/serial/amba-pl010.c
@@ -47,11 +47,12 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/amba/bus.h>
+#include <linux/amba/serial.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/hardware/amba.h>
-#include <asm/hardware/amba_serial.h>
+#include <asm/hardware.h>
 
 #define UART_NR                2
 
@@ -689,7 +690,7 @@ static int __init pl010_console_setup(struct console *co, char *options)
        return uart_set_options(port, co, baud, parity, bits, flow);
 }
 
-extern struct uart_driver amba_reg;
+static struct uart_driver amba_reg;
 static struct console amba_console = {
        .name           = "ttyAM",
        .write          = pl010_console_write,