diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 12:04:45 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 12:04:45 -0400 |
| commit | fe47784ba5cbb6b713c013e046859946789b45e4 (patch) | |
| tree | 6384958d55e29be0d2eb8ae78fa437c10636d8d6 /include/linux/usb/serial.h | |
| parent | 83b8e28b14d63db928cb39e5c5ed2a548246bd71 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/xsave
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'include/linux/usb/serial.h')
| -rw-r--r-- | include/linux/usb/serial.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index 09a3e6a7518f..655341d0f534 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h | |||
| @@ -17,7 +17,8 @@ | |||
| 17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
| 18 | 18 | ||
| 19 | #define SERIAL_TTY_MAJOR 188 /* Nice legal number now */ | 19 | #define SERIAL_TTY_MAJOR 188 /* Nice legal number now */ |
| 20 | #define SERIAL_TTY_MINORS 255 /* loads of devices :) */ | 20 | #define SERIAL_TTY_MINORS 254 /* loads of devices :) */ |
| 21 | #define SERIAL_TTY_NO_MINOR 255 /* No minor was assigned */ | ||
| 21 | 22 | ||
| 22 | /* The maximum number of ports one device can grab at once */ | 23 | /* The maximum number of ports one device can grab at once */ |
| 23 | #define MAX_NUM_PORTS 8 | 24 | #define MAX_NUM_PORTS 8 |