diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-09-10 16:58:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-10 16:58:42 -0400 |
| commit | 72787aa866bfa6bcbd259e7a39b2f9a2f412794e (patch) | |
| tree | 1769d854a26f444875f7cdfd9982fe494a4cff71 /include/linux/miscdevice.h | |
| parent | ad9f6677575e80ce23cb491d5ffb7b536772552e (diff) | |
| parent | 0a072a247fa79979dd31813decb6b118d7d511fd (diff) | |
Merge branches 'tegra/board' and 'at91/board' into next/board
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 18fd13028ba1..c309b1ecdc1c 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #define BTRFS_MINOR 234 | 40 | #define BTRFS_MINOR 234 |
| 41 | #define AUTOFS_MINOR 235 | 41 | #define AUTOFS_MINOR 235 |
| 42 | #define MAPPER_CTRL_MINOR 236 | 42 | #define MAPPER_CTRL_MINOR 236 |
| 43 | #define LOOP_CTRL_MINOR 237 | ||
| 43 | #define MISC_DYNAMIC_MINOR 255 | 44 | #define MISC_DYNAMIC_MINOR 255 |
| 44 | 45 | ||
| 45 | struct device; | 46 | struct device; |