Pull tty/serial patches from Greg Kroah-Hartman: "Here's the big tty/serial driver patches for 3.9-rc1. More tty port rework and fixes from Jiri here, as well as lots of individual serial driver updates and fixes. All of these have been in the linux-next tree for a while." * tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (140 commits) tty: mxser: improve error handling in mxser_probe() and mxser_module_init() serial: imx: fix uninitialized variable warning serial: tegra: assume CONFIG_OF TTY: do not update atime/mtime on read/write lguest: select CONFIG_TTY to build properly. ARM defconfigs: add missing inclusions of linux/platform_device.h fb/exynos: include platform_device.h ARM: sa1100/assabet: include platform_device.h directly serial: imx: Fix recursive locking bug pps: Fix build breakage from decoupling pps from tty tty: Remove ancient hardpps() pps: Additional cleanups in uart_handle_dcd_change pps: Move timestamp read into PPS code proper pps: Don't crash the machine when exiting will do pps: Fix a use-after free bug when unregistering a source. pps: Use pps_lookup_dev to reduce ldisc coupling pps: Add pps_lookup_dev() function tty: serial: uartlite: Support uartlite on big and little endian systems tty: serial: uartlite: Fix sparse and checkpatch warnings serial/arc-uart: Miscll DT related updates (Grant's review comments) ... Fix up trivial conflicts, mostly just due to the TTY config option clashing with the EXPERIMENTAL removal.
Showing the changes to include/uapi/linux (1 of 267 files). Show all
Unified · Split
| @@ -50,7 +50,7 @@ · 49 unmodified lines | ||
| 50 | 50 | #define PORT_LPC3220 22 /* NXP LPC32xx SoC "Standard" UART */ |
| 51 | 51 | #define PORT_8250_CIR 23 /* CIR infrared port, has its own driver */ |
| 52 | 52 | #define PORT_XR17V35X 24 /* Exar XR17V35x UARTs */ |
| 53 | −#define PORT_BRCM_TRUMANAGE 24 | |
| 53 | +#define PORT_BRCM_TRUMANAGE 25 | |
| 54 | 54 | #define PORT_MAX_8250 25 /* max port ID */ |
| 55 | 55 | |
| 56 | 56 | /* |
| @@ -220,4 +220,7 @@ · 163 unmodified lines | ||
| 220 | 220 | /* ARC (Synopsys) on-chip UART */ |
| 221 | 221 | #define PORT_ARC 101 |
| 222 | 222 | |
| 223 | +/* Rocketport EXPRESS/INFINITY */ | |
| 224 | +#define PORT_RP2 102 | |
| 225 | + | |
| 223 | 226 | #endif /* _UAPILINUX_SERIAL_CORE_H */ |