Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d16436e686949a17b3bcfff2d688c97354b599aa

Authored by Stephen Rothwell
Committed by David S. Miller
1 parent 483772469d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, 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

[SPARC]: remove duplicate TIOCPKT_ definitions 

The TIOCPKT_ macros are defined by all other architectures in asm/ioctls.h
and so does sparc and sparc64, so reomve the duplicates in asm/termios.h.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 0 additions and 18 deletions Side-by-side Diff

include/asm-sparc/termios.h
Diff comments   View file @ d16436e
... ... @@ -38,15 +38,6 @@
38 38 int st_columns; /* Columns on the terminal */
39 39 };
40 40  
41   -/* Used for packet mode */
42   -#define TIOCPKT_DATA 0
43   -#define TIOCPKT_FLUSHREAD 1
44   -#define TIOCPKT_FLUSHWRITE 2
45   -#define TIOCPKT_STOP 4
46   -#define TIOCPKT_START 8
47   -#define TIOCPKT_NOSTOP 16
48   -#define TIOCPKT_DOSTOP 32
49   -
50 41 struct winsize {
51 42 unsigned short ws_row;
52 43 unsigned short ws_col;
include/asm-sparc64/termios.h
Diff comments   View file @ d16436e
... ... @@ -38,15 +38,6 @@
38 38 int st_columns; /* Columns on the terminal */
39 39 };
40 40  
41   -/* Used for packet mode */
42   -#define TIOCPKT_DATA 0
43   -#define TIOCPKT_FLUSHREAD 1
44   -#define TIOCPKT_FLUSHWRITE 2
45   -#define TIOCPKT_STOP 4
46   -#define TIOCPKT_START 8
47   -#define TIOCPKT_NOSTOP 16
48   -#define TIOCPKT_DOSTOP 32
49   -
50 41 struct winsize {
51 42 unsigned short ws_row;
52 43 unsigned short ws_col;