diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 16:51:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 16:51:55 -0700 |
| commit | b142ebb61cd36370c6fac5e0b8261a6cd7bba782 (patch) | |
| tree | c08596ccf85dbcf0f14f878f7f468756d50d983c /drivers | |
| parent | 218ce7351413b8287a80fab1d7b94906a5559f01 (diff) | |
| parent | 578454ff7eab61d13a26b568f99a89a2c9edc881 (diff) | |
| download | lwn-b142ebb61cd36370c6fac5e0b8261a6cd7bba782.tar.gz lwn-b142ebb61cd36370c6fac5e0b8261a6cd7bba782.zip | |
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')
| -rw-r--r-- | drivers/net/ppp_generic.c | 4 | ||||
| -rw-r--r-- | drivers/net/tun.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 5441688daba7..c5f8eb102bf7 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c @@ -2926,5 +2926,5 @@ EXPORT_SYMBOL(ppp_output_wakeup); EXPORT_SYMBOL(ppp_register_compressor); EXPORT_SYMBOL(ppp_unregister_compressor); MODULE_LICENSE("GPL"); -MODULE_ALIAS_CHARDEV_MAJOR(PPP_MAJOR); -MODULE_ALIAS("/dev/ppp"); +MODULE_ALIAS_CHARDEV(PPP_MAJOR, 0); +MODULE_ALIAS("devname:ppp"); 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); MODULE_AUTHOR(DRV_COPYRIGHT); MODULE_LICENSE("GPL"); MODULE_ALIAS_MISCDEV(TUN_MINOR); +MODULE_ALIAS("devname:net/tun"); |