This pulls in most of Linus tree up to -rc6, this fixes the worst lockdep reported issues and re-enables fbcon lockdep. (not the fbcon maintainer) * 'fbcon-locking-fixes' of ssh://people.freedesktop.org/~airlied/linux: (529 commits) Revert "Revert "console: implement lockdep support for console_lock"" fbcon: fix locking harder fb: Yet another band-aid for fixing lockdep mess fb: rework locking to fix lock ordering on takeover
Showing the changes to include/uapi (1 of 522 files). Show all
Unified · Split
| @@ -50,7 +50,8 @@ · 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_MAX_8250 24 /* max port ID */ | |
| 53 | +#define PORT_BRCM_TRUMANAGE 24 | |
| 54 | +#define PORT_MAX_8250 25 /* max port ID */ | |
| 54 | 55 | |
| 55 | 56 | /* |
| 56 | 57 | * ARM specific type numbers. These are not currently guaranteed |