diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-10-30 16:24:37 +1000 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-11-14 08:50:56 +0100 |
| commit | 20e42aede9e7b78c2ffd8a03501e3090fbb78811 (patch) | |
| tree | 16457d6506103b5674614656704e7d435531dcce /arch/m68k/include/uapi/asm | |
| parent | 599a0c4e125628eae356498a88177e9fbf183e79 (diff) | |
| download | linux-20e42aede9e7b78c2ffd8a03501e3090fbb78811.tar.gz linux-20e42aede9e7b78c2ffd8a03501e3090fbb78811.tar.bz2 linux-20e42aede9e7b78c2ffd8a03501e3090fbb78811.zip | |
m68k: switch to using the asm-generic termios.h
We don't need a local termios.h, switch to using the asm-generic versions.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/uapi/asm')
| -rw-r--r-- | arch/m68k/include/uapi/asm/Kbuild | 2 | ||||
| -rw-r--r-- | arch/m68k/include/uapi/asm/termios.h | 44 |
2 files changed, 1 insertions, 45 deletions
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild index 931454eabd20..1fef45ada097 100644 --- a/arch/m68k/include/uapi/asm/Kbuild +++ b/arch/m68k/include/uapi/asm/Kbuild @@ -8,6 +8,7 @@ generic-y += shmbuf.h generic-y += socket.h generic-y += sockios.h generic-y += termbits.h +generic-y += termios.h header-y += a.out.h header-y += byteorder.h @@ -23,5 +24,4 @@ header-y += sigcontext.h header-y += signal.h header-y += stat.h header-y += swab.h -header-y += termios.h header-y += unistd.h diff --git a/arch/m68k/include/uapi/asm/termios.h b/arch/m68k/include/uapi/asm/termios.h deleted file mode 100644 index ce2142c9ac1d..000000000000 --- a/arch/m68k/include/uapi/asm/termios.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef _UAPI_M68K_TERMIOS_H -#define _UAPI_M68K_TERMIOS_H - -#include <asm/termbits.h> -#include <asm/ioctls.h> - -struct winsize { - unsigned short ws_row; - unsigned short ws_col; - unsigned short ws_xpixel; - unsigned short ws_ypixel; -}; - -#define NCC 8 -struct termio { - unsigned short c_iflag; /* input mode flags */ - unsigned short c_oflag; /* output mode flags */ - unsigned short c_cflag; /* control mode flags */ - unsigned short c_lflag; /* local mode flags */ - unsigned char c_line; /* line discipline */ - unsigned char c_cc[NCC]; /* control characters */ -}; - - -/* modem lines */ -#define TIOCM_LE 0x001 -#define TIOCM_DTR 0x002 -#define TIOCM_RTS 0x004 -#define TIOCM_ST 0x008 -#define TIOCM_SR 0x010 -#define TIOCM_CTS 0x020 -#define TIOCM_CAR 0x040 -#define TIOCM_RNG 0x080 -#define TIOCM_DSR 0x100 -#define TIOCM_CD TIOCM_CAR -#define TIOCM_RI TIOCM_RNG -#define TIOCM_OUT1 0x2000 -#define TIOCM_OUT2 0x4000 -#define TIOCM_LOOP 0x8000 - -/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ - - -#endif /* _UAPI_M68K_TERMIOS_H */ |