diff options
| author | Hector Martin <marcan@marcan.st> | 2021-04-08 19:17:19 +0900 |
|---|---|---|
| committer | Hector Martin <marcan@marcan.st> | 2021-04-08 19:17:33 +0900 |
| commit | fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d (patch) | |
| tree | d417b1a0b9db925fc791393bdfeee2099ef32028 /include/uapi/linux/major.h | |
| parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) | |
| parent | 71b25f4df9849799d84d9345c636aac097316052 (diff) | |
Merge commit '71b25f4df984' from tty/tty-next
This point in gregkh's tty-next tree includes all the samsung_tty
changes that were part of v3 of the M1 bring-up series, and have
already been merged in.
Signed-off-by: Hector Martin <marcan@marcan.st>
Diffstat (limited to 'include/uapi/linux/major.h')
| -rw-r--r-- | include/uapi/linux/major.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/uapi/linux/major.h b/include/uapi/linux/major.h index 7e5fa8e15c43..4e5f2b3a3d54 100644 --- a/include/uapi/linux/major.h +++ b/include/uapi/linux/major.h @@ -34,8 +34,6 @@ #define GOLDSTAR_CDROM_MAJOR 16 #define OPTICS_CDROM_MAJOR 17 #define SANYO_CDROM_MAJOR 18 -#define CYCLADES_MAJOR 19 -#define CYCLADESAUX_MAJOR 20 #define MITSUMI_X_CDROM_MAJOR 20 #define MFM_ACORN_MAJOR 21 /* ARM Linux /dev/mfm */ #define SCSI_GENERIC_MAJOR 21 |