diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-25 11:16:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-25 11:16:27 +1000 |
| commit | b7618073a660840619354a19f849b0a93aa77725 (patch) | |
| tree | ef725f86d8df20a0d59ec7ea11bd1f53313ca2d8 /drivers | |
| parent | 311e716166d0208d41e3ec800ae06cce68ce36d3 (diff) | |
| parent | 640c8e0789a4f79cc43d6d026998f398e7711a38 (diff) | |
Merge branch 'quilt/driver-core.current'
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 8793c2bf7f15..6ad6fe706312 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1651,3 +1651,4 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_AUTHOR(DRV_COPYRIGHT); MODULE_LICENSE("GPL"); MODULE_ALIAS_MISCDEV(TUN_MINOR); +MODULE_ALIAS("devname:net/tun"); |