diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 18:55:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 18:55:39 -0400 |
| commit | a57c21c7159e07c27e317ea3513dfb382be3f153 (patch) | |
| tree | d70427d2d2f44b9d973aa21e7eef93f30f17515d /drivers/net | |
| parent | e11c675ede0d42a405ae595528bf0b29ce1ae56f (diff) | |
| parent | e454cea20bdcff10ee698d11b8882662a0153a47 (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: extend devnode callbacks to provide permissions
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 3f5d28851aa2..d3ee1994b02f 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -1370,7 +1370,7 @@ static const struct file_operations tun_fops = { | |||
| 1370 | static struct miscdevice tun_miscdev = { | 1370 | static struct miscdevice tun_miscdev = { |
| 1371 | .minor = TUN_MINOR, | 1371 | .minor = TUN_MINOR, |
| 1372 | .name = "tun", | 1372 | .name = "tun", |
| 1373 | .devnode = "net/tun", | 1373 | .nodename = "net/tun", |
| 1374 | .fops = &tun_fops, | 1374 | .fops = &tun_fops, |
| 1375 | }; | 1375 | }; |
| 1376 | 1376 | ||