diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 03:51:55 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 03:51:55 +0400 |
| commit | b142ebb61cd36370c6fac5e0b8261a6cd7bba782 (patch) | |
| tree | c08596ccf85dbcf0f14f878f7f468756d50d983c /include/linux | |
| parent | 218ce7351413b8287a80fab1d7b94906a5559f01 (diff) | |
| parent | 578454ff7eab61d13a26b568f99a89a2c9edc881 (diff) | |
| download | linux-b142ebb61cd36370c6fac5e0b8261a6cd7bba782.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
driver core: add devname module aliases to allow module on-demand auto-loading
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/miscdevice.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 8b5f7cc0fba6..b631c46cffd9 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h @@ -31,6 +31,8 @@ #define FUSE_MINOR 229 #define KVM_MINOR 232 #define VHOST_NET_MINOR 233 +#define BTRFS_MINOR 234 +#define AUTOFS_MINOR 235 #define MISC_DYNAMIC_MINOR 255 struct device; |