diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-20 23:06:15 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-20 23:06:15 +0100 |
| commit | d1a7fddf420b1f5a7d9a899b3388026084a67d33 (patch) | |
| tree | 7044a8b9a1b6fadc7b027d4a82840c084b0c8012 /net/decnet/dn_dev.c | |
| parent | 778c4c821779bb7eef7f5a1eea4d15d05d976f8b (diff) | |
| parent | c0e1936338a11ea252d11370ff62e40db334f646 (diff) | |
| download | linux-d1a7fddf420b1f5a7d9a899b3388026084a67d33.tar.gz | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
Diffstat (limited to 'net/decnet/dn_dev.c')
| -rw-r--r-- | net/decnet/dn_dev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 8008c8613027..28e26bd08e24 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c @@ -490,9 +490,7 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg) return -EFAULT; ifr->ifr_name[IFNAMSIZ-1] = 0; -#ifdef CONFIG_KMOD dev_load(&init_net, ifr->ifr_name); -#endif switch(cmd) { case SIOCGIFADDR: |