diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
| commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
| tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /include/linux/miscdevice.h | |
| parent | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (diff) | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'include/linux/miscdevice.h')
| -rw-r--r-- | include/linux/miscdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index cb358355ef43..f7eaf2d60083 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #define I2O_MINOR 166 | 31 | #define I2O_MINOR 166 |
| 32 | #define MICROCODE_MINOR 184 | 32 | #define MICROCODE_MINOR 184 |
| 33 | #define TUN_MINOR 200 | 33 | #define TUN_MINOR 200 |
| 34 | #define CUSE_MINOR 203 | ||
| 34 | #define MWAVE_MINOR 219 /* ACP/Mwave Modem */ | 35 | #define MWAVE_MINOR 219 /* ACP/Mwave Modem */ |
| 35 | #define MPT_MINOR 220 | 36 | #define MPT_MINOR 220 |
| 36 | #define MPT2SAS_MINOR 221 | 37 | #define MPT2SAS_MINOR 221 |