diff options
author | Andy Green <andy@openmoko.com> | 2008-11-19 17:10:01 +0000 |
---|---|---|
committer | Andy Green <andy@openmoko.com> | 2008-11-19 17:10:01 +0000 |
commit | 0122fbb035c714844bca7333476e31ffd365b4c3 (patch) | |
tree | 4ca3defffd4826cb241e19c069fdfbcfe9400a23 /drivers | |
parent | 7850a27c0220bfbcebb29d256d403d66750ed98d (diff) |
tracking-2.6.27-rc1-tty-not-in-uart_port.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h | 2 | ||||
-rw-r--r-- | drivers/serial/s3c2410.c | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h index 655288b32ba..9e8ce0216a4 100644 --- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h +++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h @@ -34,7 +34,7 @@ #include <net/iw_handler.h> #include <linux/if_arp.h> #include <linux/ip.h> -#include <asm/semaphore.h> +#include <linux/semaphore.h> #include <linux/wireless.h> #include <linux/module.h> #include <asm/io.h> diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index bcf0fdb9096..55e20e42b7c 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c @@ -263,7 +263,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id) { struct s3c24xx_uart_port *ourport = dev_id; struct uart_port *port = &ourport->port; - struct tty_struct *tty = port->info->tty; + struct tty_struct *tty = port->info->port.tty; unsigned int ufcon, ch, flag, ufstat, uerstat; int max_count = 64; @@ -1186,6 +1186,14 @@ static int s3c24xx_serial_init(struct platform_driver *drv, return platform_driver_register(drv); } +static inline int s3c2400_serial_init(void) +{ + return s3c24xx_serial_init(&s3c2400_serial_drv, &s3c2400_uart_inf); +} +static inline void s3c2400_serial_exit(void) +{ + platform_driver_unregister(&s3c2400_serial_drv); +} /* now comes the code to initialise either the s3c2410 or s3c2440 serial * port information |