Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit ee160a38eee357ed2572cf41437d5814ce53c839

Authored by Jiri Slaby
Committed by Greg Kroah-Hartman
1 parent 2c16a35310
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

TTY: serial, fix includes in some drivers 

linux/tty_flip.h is included in linux/serial_core.h. But this may (and
will) change in the future. Then we would get build errors such as:
.../tty/serial/max3107.c: In function ‘put_data_to_circ_buf’:
.../tty/serial/max3107.c:149:2: error: implicit declaration of function ‘tty_insert_flip_string’

So fix all the drviers which call tty flip buffer helpers to really
include linux/tty_flip.h. And also make sure that those include
linux/tty.h when operating with struct tty_struct.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 22 changed files with 33 additions and 2 deletions Side-by-side Diff

drivers/tty/serial/apbuart.c
Diff comments   View file @ ee160a3
... ... @@ -16,6 +16,7 @@
16 16  
17 17 #include <linux/module.h>
18 18 #include <linux/tty.h>
  19 +#include <linux/tty_flip.h>
19 20 #include <linux/ioport.h>
20 21 #include <linux/init.h>
21 22 #include <linux/serial.h>
drivers/tty/serial/cpm_uart/cpm_uart_core.c
Diff comments   View file @ ee160a3
... ... @@ -31,6 +31,7 @@
31 31  
32 32 #include <linux/module.h>
33 33 #include <linux/tty.h>
  34 +#include <linux/tty_flip.h>
34 35 #include <linux/ioport.h>
35 36 #include <linux/init.h>
36 37 #include <linux/serial.h>
drivers/tty/serial/dz.c
Diff comments   View file @ ee160a3
... ... @@ -47,6 +47,7 @@
47 47 #include <linux/serial_core.h>
48 48 #include <linux/sysrq.h>
49 49 #include <linux/tty.h>
  50 +#include <linux/tty_flip.h>
50 51  
51 52 #include <linux/atomic.h>
52 53 #include <asm/bootinfo.h>
drivers/tty/serial/ioc3_serial.c
Diff comments   View file @ ee160a3
... ... @@ -13,6 +13,7 @@
13 13 */
14 14 #include <linux/errno.h>
15 15 #include <linux/tty.h>
  16 +#include <linux/tty_flip.h>
16 17 #include <linux/serial.h>
17 18 #include <linux/circ_buf.h>
18 19 #include <linux/serial_reg.h>
drivers/tty/serial/ioc4_serial.c
Diff comments   View file @ ee160a3
... ... @@ -14,6 +14,7 @@
14 14 */
15 15 #include <linux/errno.h>
16 16 #include <linux/tty.h>
  17 +#include <linux/tty_flip.h>
17 18 #include <linux/serial.h>
18 19 #include <linux/serialP.h>
19 20 #include <linux/circ_buf.h>
drivers/tty/serial/m32r_sio.c
Diff comments   View file @ ee160a3
... ... @@ -32,6 +32,7 @@
32 32  
33 33 #include <linux/module.h>
34 34 #include <linux/tty.h>
  35 +#include <linux/tty_flip.h>
35 36 #include <linux/ioport.h>
36 37 #include <linux/init.h>
37 38 #include <linux/console.h>
drivers/tty/serial/max3100.c
Diff comments   View file @ ee160a3
... ... @@ -47,6 +47,8 @@
47 47 #include <linux/serial.h>
48 48 #include <linux/spi/spi.h>
49 49 #include <linux/freezer.h>
  50 +#include <linux/tty.h>
  51 +#include <linux/tty_flip.h>
50 52  
51 53 #include <linux/serial_max3100.h>
52 54  
drivers/tty/serial/max3107.c
Diff comments   View file @ ee160a3
... ... @@ -31,6 +31,8 @@
31 31 #include <linux/device.h>
32 32 #include <linux/serial_core.h>
33 33 #include <linux/serial.h>
  34 +#include <linux/tty.h>
  35 +#include <linux/tty_flip.h>
34 36 #include <linux/gpio.h>
35 37 #include <linux/spi/spi.h>
36 38 #include <linux/freezer.h>
drivers/tty/serial/mpc52xx_uart.c
Diff comments   View file @ ee160a3
... ... @@ -34,6 +34,7 @@
34 34 #include <linux/device.h>
35 35 #include <linux/module.h>
36 36 #include <linux/tty.h>
  37 +#include <linux/tty_flip.h>
37 38 #include <linux/serial.h>
38 39 #include <linux/sysrq.h>
39 40 #include <linux/console.h>
drivers/tty/serial/msm_serial_hs.c
Diff comments   View file @ ee160a3
... ... @@ -30,6 +30,8 @@
30 30  
31 31 #include <linux/serial.h>
32 32 #include <linux/serial_core.h>
  33 +#include <linux/tty.h>
  34 +#include <linux/tty_flip.h>
33 35 #include <linux/slab.h>
34 36 #include <linux/init.h>
35 37 #include <linux/interrupt.h>
drivers/tty/serial/mux.c
Diff comments   View file @ ee160a3
... ... @@ -21,6 +21,8 @@
21 21 #include <linux/ioport.h>
22 22 #include <linux/init.h>
23 23 #include <linux/serial.h>
  24 +#include <linux/tty.h>
  25 +#include <linux/tty_flip.h>
24 26 #include <linux/console.h>
25 27 #include <linux/delay.h> /* for udelay */
26 28 #include <linux/device.h>
drivers/tty/serial/nwpserial.c
Diff comments   View file @ ee160a3
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/serial_reg.h>
16 16 #include <linux/serial_core.h>
17 17 #include <linux/tty.h>
  18 +#include <linux/tty_flip.h>
18 19 #include <linux/irqreturn.h>
19 20 #include <linux/mutex.h>
20 21 #include <linux/of_platform.h>
drivers/tty/serial/pch_uart.c
Diff comments   View file @ ee160a3
... ... @@ -20,6 +20,8 @@
20 20 #include <linux/module.h>
21 21 #include <linux/pci.h>
22 22 #include <linux/serial_core.h>
  23 +#include <linux/tty.h>
  24 +#include <linux/tty_flip.h>
23 25 #include <linux/interrupt.h>
24 26 #include <linux/io.h>
25 27 #include <linux/dmi.h>
drivers/tty/serial/sb1250-duart.c
Diff comments   View file @ ee160a3
... ... @@ -37,6 +37,7 @@
37 37 #include <linux/spinlock.h>
38 38 #include <linux/sysrq.h>
39 39 #include <linux/tty.h>
  40 +#include <linux/tty_flip.h>
40 41 #include <linux/types.h>
41 42  
42 43 #include <linux/atomic.h>
drivers/tty/serial/serial_ks8695.c
Diff comments   View file @ ee160a3
... ... @@ -13,6 +13,7 @@
13 13 */
14 14 #include <linux/module.h>
15 15 #include <linux/tty.h>
  16 +#include <linux/tty_flip.h>
16 17 #include <linux/ioport.h>
17 18 #include <linux/init.h>
18 19 #include <linux/serial.h>
drivers/tty/serial/serial_txx9.c
Diff comments   View file @ ee160a3
... ... @@ -28,6 +28,8 @@
28 28 #include <linux/pci.h>
29 29 #include <linux/serial_core.h>
30 30 #include <linux/serial.h>
  31 +#include <linux/tty.h>
  32 +#include <linux/tty_flip.h>
31 33  
32 34 #include <asm/io.h>
33 35  
drivers/tty/serial/sn_console.c
Diff comments   View file @ ee160a3
... ... @@ -39,6 +39,7 @@
39 39  
40 40 #include <linux/interrupt.h>
41 41 #include <linux/tty.h>
  42 +#include <linux/tty_flip.h>
42 43 #include <linux/serial.h>
43 44 #include <linux/console.h>
44 45 #include <linux/module.h>
drivers/tty/serial/timbuart.c
Diff comments   View file @ ee160a3
... ... @@ -23,6 +23,8 @@
23 23 #include <linux/pci.h>
24 24 #include <linux/interrupt.h>
25 25 #include <linux/serial_core.h>
  26 +#include <linux/tty.h>
  27 +#include <linux/tty_flip.h>
26 28 #include <linux/kernel.h>
27 29 #include <linux/platform_device.h>
28 30 #include <linux/ioport.h>
drivers/tty/serial/uartlite.c
Diff comments   View file @ ee160a3
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/serial.h>
16 16 #include <linux/serial_core.h>
17 17 #include <linux/tty.h>
  18 +#include <linux/tty_flip.h>
18 19 #include <linux/delay.h>
19 20 #include <linux/interrupt.h>
20 21 #include <linux/init.h>
drivers/tty/serial/ucc_uart.c
Diff comments   View file @ ee160a3
... ... @@ -20,8 +20,10 @@
20 20  
21 21 #include <linux/module.h>
22 22 #include <linux/serial.h>
23   -#include <linux/slab.h>
24 23 #include <linux/serial_core.h>
  24 +#include <linux/slab.h>
  25 +#include <linux/tty.h>
  26 +#include <linux/tty_flip.h>
25 27 #include <linux/io.h>
26 28 #include <linux/of_platform.h>
27 29 #include <linux/dma-mapping.h>
drivers/tty/serial/xilinx_uartps.c
Diff comments   View file @ ee160a3
... ... @@ -12,9 +12,11 @@
12 12 */
13 13  
14 14 #include <linux/platform_device.h>
  15 +#include <linux/serial.h>
15 16 #include <linux/serial_core.h>
  17 +#include <linux/tty.h>
  18 +#include <linux/tty_flip.h>
16 19 #include <linux/console.h>
17   -#include <linux/serial.h>
18 20 #include <linux/irq.h>
19 21 #include <linux/io.h>
20 22 #include <linux/of.h>
drivers/tty/serial/zs.c
Diff comments   View file @ ee160a3
... ... @@ -63,6 +63,7 @@
63 63 #include <linux/spinlock.h>
64 64 #include <linux/sysrq.h>
65 65 #include <linux/tty.h>
  66 +#include <linux/tty_flip.h>
66 67 #include <linux/types.h>
67 68  
68 69 #include <linux/atomic.h>