kmod-crypto: fix selecting core crypto modules

[openwrt.git] / target / linux / amazon / files / drivers / serial / amazon_asc.c

diff --git a/target/linux/amazon/files/drivers/serial/amazon_asc.c b/target/linux/amazon/files/drivers/serial/amazon_asc.c
index f7fa907..4492086 100644 (file)
--- a/target/linux/amazon/files/drivers/serial/amazon_asc.c
+++ b/target/linux/amazon/files/drivers/serial/amazon_asc.c
@@ -68,11 +68,9 @@
 #define SERIAL_AMAZONASC_NR    UART_NR
 
 static void amazonasc_tx_chars(struct uart_port *port);
 #define SERIAL_AMAZONASC_NR    UART_NR
 
 static void amazonasc_tx_chars(struct uart_port *port);

-extern void prom_printf(const char * fmt, ...);

 static struct uart_port amazonasc_ports[UART_NR];
 static struct uart_driver amazonasc_reg;
 static unsigned int uartclk = 0;
 static struct uart_port amazonasc_ports[UART_NR];
 static struct uart_driver amazonasc_reg;
 static unsigned int uartclk = 0;

-extern unsigned int amazon_get_fpi_hz(void);

 
 static void amazonasc_stop_tx(struct uart_port *port)
 {
 
 static void amazonasc_stop_tx(struct uart_port *port)
 {


@@ -108,10 +106,10 @@ static void amazonasc_enable_ms(struct uart_port *port)
 static void
 amazonasc_rx_chars(struct uart_port *port)
 {
 static void
 amazonasc_rx_chars(struct uart_port *port)
 {

-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 26))
-       struct tty_struct *tty = port->info->port.tty;
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 31))
+       struct tty_struct *tty = port->state->port.tty;

 #else
 #else

-       struct tty_struct *tty = port->info->tty;
+       struct tty_struct *tty = port->info->port.tty;

 #endif
        unsigned int ch = 0, rsr = 0, fifocnt;
 
 #endif
        unsigned int ch = 0, rsr = 0, fifocnt;
 


@@ -169,7 +167,11 @@ amazonasc_rx_chars(struct uart_port *port)
 
 static void amazonasc_tx_chars(struct uart_port *port)
 {
 
 static void amazonasc_tx_chars(struct uart_port *port)
 {

+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 31))
+       struct circ_buf *xmit = &port->state->xmit;
+#else

        struct circ_buf *xmit = &port->info->xmit;
        struct circ_buf *xmit = &port->info->xmit;

+#endif

 
        if (uart_tx_stopped(port)) {
                amazonasc_stop_tx(port);
 
        if (uart_tx_stopped(port)) {
                amazonasc_stop_tx(port);


@@ -654,13 +656,6 @@ static struct console amazonasc_console = {
        data:           &amazonasc_reg,
 };
 
        data:           &amazonasc_reg,
 };
 

-static int __init amazonasc_console_init(void)
-{
-       register_console(&amazonasc_console);
-       return 0;
-}
-console_initcall(amazonasc_console_init);
-

 static struct uart_driver amazonasc_reg = {
        .owner =                        THIS_MODULE,
        .driver_name =          "serial",
 static struct uart_driver amazonasc_reg = {
        .owner =                        THIS_MODULE,
        .driver_name =          "serial",


@@ -679,7 +674,7 @@ static int __init amazon_asc_probe(struct platform_device *dev)
        return res;
 }
 
        return res;
 }
 

-static int __exit amazon_asc_remove(struct platform_device *dev)
+static int amazon_asc_remove(struct platform_device *dev)

 {
        uart_unregister_driver(&amazonasc_reg);
        return 0;
 {
        uart_unregister_driver(&amazonasc_reg);
        return 0;