diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2015-02-02 13:38:03 +0100 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2015-02-02 13:38:03 +0100 |
commit | 43328a22788c8d856f30a9b0b909e00b7a0c6ecc (patch) | |
tree | 1ef1604ea6a297c5b83d3821ba19757946d7e67f /drivers/tty/serial/men_z135_uart.c | |
parent | 7a615209551c7a9f3a0dea4f6341ebbb2f2dc9c9 (diff) | |
parent | c2d6598eefba9cbe5ca69ab6ca59e31f797169ac (diff) |
Merge tag 'v3.18.5' into toradex_vf_3.18-next
This is the 3.18.5 stable release
Conflicts:
arch/arm/mach-imx/clk-imx6q.c
Diffstat (limited to 'drivers/tty/serial/men_z135_uart.c')
-rw-r--r-- | drivers/tty/serial/men_z135_uart.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/men_z135_uart.c b/drivers/tty/serial/men_z135_uart.c index 30e9e60bc5cd..517cd073dc08 100644 --- a/drivers/tty/serial/men_z135_uart.c +++ b/drivers/tty/serial/men_z135_uart.c @@ -809,6 +809,7 @@ static void men_z135_remove(struct mcb_device *mdev) static const struct mcb_device_id men_z135_ids[] = { { .device = 0x87 }, + { } }; MODULE_DEVICE_TABLE(mcb, men_z135_ids); |