diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /drivers/net/tun.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 6c62d5c88268..329d9feb9b89 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #define DRV_DESCRIPTION "Universal TUN/TAP device driver" | 39 | #define DRV_DESCRIPTION "Universal TUN/TAP device driver" |
| 40 | #define DRV_COPYRIGHT "(C) 1999-2004 Max Krasnyansky <maxk@qualcomm.com>" | 40 | #define DRV_COPYRIGHT "(C) 1999-2004 Max Krasnyansky <maxk@qualcomm.com>" |
| 41 | 41 | ||
| 42 | #include <linux/config.h> | ||
| 43 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 44 | #include <linux/errno.h> | 43 | #include <linux/errno.h> |
| 45 | #include <linux/kernel.h> | 44 | #include <linux/kernel.h> |
| @@ -780,7 +779,6 @@ static struct miscdevice tun_miscdev = { | |||
| 780 | .minor = TUN_MINOR, | 779 | .minor = TUN_MINOR, |
| 781 | .name = "tun", | 780 | .name = "tun", |
| 782 | .fops = &tun_fops, | 781 | .fops = &tun_fops, |
| 783 | .devfs_name = "net/tun", | ||
| 784 | }; | 782 | }; |
| 785 | 783 | ||
| 786 | /* ethtool interface */ | 784 | /* ethtool interface */ |