Merge branch 'master' into csb1725

[mv-sheeva.git] / include / linux / altera_uart.h

diff --git a/include/linux/altera_uart.h b/include/linux/altera_uart.h
index 8d441064a30dddb480a06f21c417f62869023a26..a10a907919764811678f994819f053efb379a9e8 100644 (file)
--- a/include/linux/altera_uart.h
+++ b/include/linux/altera_uart.h
@@ -5,10 +5,15 @@
 #ifndef        __ALTUART_H
 #define        __ALTUART_H
 
+#include <linux/init.h>
+
 struct altera_uart_platform_uart {
        unsigned long mapbase;  /* Physical address base */
        unsigned int irq;       /* Interrupt vector */
        unsigned int uartclk;   /* UART clock rate */
+       unsigned int bus_shift; /* Bus shift (address stride) */
 };
 
+int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp);
+
 #endif /* __ALTUART_H */