diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 19:51:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 19:51:55 -0400 |
| commit | b142ebb61cd36370c6fac5e0b8261a6cd7bba782 (patch) | |
| tree | c08596ccf85dbcf0f14f878f7f468756d50d983c /drivers/net/tun.c | |
| parent | 218ce7351413b8287a80fab1d7b94906a5559f01 (diff) | |
| parent | 578454ff7eab61d13a26b568f99a89a2c9edc881 (diff) | |
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 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 97b25533e5fb..005cad689578 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -1649,3 +1649,4 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); | |||
| 1649 | MODULE_AUTHOR(DRV_COPYRIGHT); | 1649 | MODULE_AUTHOR(DRV_COPYRIGHT); |
| 1650 | MODULE_LICENSE("GPL"); | 1650 | MODULE_LICENSE("GPL"); |
| 1651 | MODULE_ALIAS_MISCDEV(TUN_MINOR); | 1651 | MODULE_ALIAS_MISCDEV(TUN_MINOR); |
| 1652 | MODULE_ALIAS("devname:net/tun"); | ||