diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-12-30 11:17:07 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-30 15:27:20 +0100 |
| commit | 7ebdfaa52d15b947503f76474477f92854796d96 (patch) | |
| tree | 27cd7acfcd264e8d643db86185f9e3a33a5cf367 /include/uapi/linux/vt.h | |
| parent | d6ad36913083d683aad4e02e53580c995f1a6ede (diff) | |
| parent | d4b0833a65e8b9fc58d992ba0cc89cad1580db31 (diff) | |
Merge tag 'mvebu-fixes-3.19' of git://git.infradead.org/linux-mvebu into fixes
Pull "Fixes for 3.19" from Andrew Lunn:
Jason is taking a back seat this cycle and i'm doing all the patch
wrangling for mvebu.
* tag 'mvebu-fixes-3.19' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Fix pinctrl configuration for Armada 370 DB
Also update to Linux 3.19-rc1, which this was based on.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/uapi/linux/vt.h')
| -rw-r--r-- | include/uapi/linux/vt.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h index 4b59a26799a3..978578bd1895 100644 --- a/include/uapi/linux/vt.h +++ b/include/uapi/linux/vt.h @@ -84,7 +84,4 @@ struct vt_setactivate { #define VT_SETACTIVATE 0x560F /* Activate and set the mode of a console */ - -#define vt_get_kmsg_redirect() vt_kmsg_redirect(-1) - #endif /* _UAPI_LINUX_VT_H */ |