From 73b50b525009bf8c5bb643982900a5b80e191006 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Apr 2013 02:04:49 +0200 Subject: [PATCH] --- yaml --- r: 364299 b: refs/heads/master c: 84f57d9e3685500a7447fc09a6891ce218869174 h: refs/heads/master i: 364297: 56ea20ba8c942243562e91ec8f55ec87a56b61bf 364295: c99b720f01966f99641680e26af7b7f08b6768cc v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/samsung.c | 4 ++-- trunk/drivers/tty/serial/samsung.h | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 815057faa085..0e01b5edf52f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ee51f01eee84a108510ac2794b9a9dff8be6d3f +refs/heads/master: 84f57d9e3685500a7447fc09a6891ce218869174 diff --git a/trunk/drivers/tty/serial/samsung.c b/trunk/drivers/tty/serial/samsung.c index 6a3695681fa5..074b9194144f 100644 --- a/trunk/drivers/tty/serial/samsung.c +++ b/trunk/drivers/tty/serial/samsung.c @@ -898,7 +898,7 @@ console_initcall(s3c24xx_serial_console_init); #define S3C24XX_SERIAL_CONSOLE NULL #endif -#ifdef CONFIG_CONSOLE_POLL +#if defined(CONFIG_SERIAL_SAMSUNG_CONSOLE) && defined(CONFIG_CONSOLE_POLL) static int s3c24xx_serial_get_poll_char(struct uart_port *port); static void s3c24xx_serial_put_poll_char(struct uart_port *port, unsigned char c); @@ -922,7 +922,7 @@ static struct uart_ops s3c24xx_serial_ops = { .request_port = s3c24xx_serial_request_port, .config_port = s3c24xx_serial_config_port, .verify_port = s3c24xx_serial_verify_port, -#ifdef CONFIG_CONSOLE_POLL +#if defined(CONFIG_SERIAL_SAMSUNG_CONSOLE) && defined(CONFIG_CONSOLE_POLL) .poll_get_char = s3c24xx_serial_get_poll_char, .poll_put_char = s3c24xx_serial_put_poll_char, #endif diff --git a/trunk/drivers/tty/serial/samsung.h b/trunk/drivers/tty/serial/samsung.h index 1a4bca3e4179..00a499ecd385 100644 --- a/trunk/drivers/tty/serial/samsung.h +++ b/trunk/drivers/tty/serial/samsung.h @@ -76,7 +76,9 @@ struct s3c24xx_uart_port { #define wr_regb(port, reg, val) __raw_writeb(val, portaddr(port, reg)) #define wr_regl(port, reg, val) __raw_writel(val, portaddr(port, reg)) -#ifdef CONFIG_SERIAL_SAMSUNG_DEBUG +#if defined(CONFIG_SERIAL_SAMSUNG_DEBUG) && \ + defined(CONFIG_DEBUG_LL) && \ + !defined(MODULE) extern void printascii(const char *);