aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/platform/ce4100
diff options
context:
space:
mode:
authorGravatar Ed Blake <ed.blake@imgtec.com> 2016-11-10 18:07:54 +0000
committerGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2016-11-16 10:59:38 +0100
commit98838d95075a5295f3478ceba18bcccf472e30f4 (patch)
tree9b38f47ee9a97a3810db662e0f168f7d0303d38b /arch/x86/platform/ce4100
parentserial: 8250_dma: power off device after TX is done (diff)
downloadlinux-98838d95075a5295f3478ceba18bcccf472e30f4.tar.gz
linux-98838d95075a5295f3478ceba18bcccf472e30f4.tar.bz2
linux-98838d95075a5295f3478ceba18bcccf472e30f4.zip
serial: 8250: Add IrDA to UART capabilities
Add an IrDA UART capability flag and change the type of uart_8250_port.capabilities to be u32 rather than unsigned short to accommodate the additional flag. Signed-off-by: Ed Blake <ed.blake@imgtec.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/platform/ce4100')
-rw-r--r--arch/x86/platform/ce4100/ce4100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c
index b27bccd4390f..821cb41f00e6 100644
--- a/arch/x86/platform/ce4100/ce4100.c
+++ b/arch/x86/platform/ce4100/ce4100.c
@@ -89,7 +89,7 @@ static void ce4100_mem_serial_out(struct uart_port *p, int offset, int value)
}
static void ce4100_serial_fixup(int port, struct uart_port *up,
- unsigned short *capabilites)
+ u32 *capabilites)
{
#ifdef CONFIG_EARLY_PRINTK
/*