diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
| commit | fec69a97489f961026e24536dbb7b86ac663948c (patch) | |
| tree | 869713470d81ebc261598489a2711960336c7c37 /net/sysctl_net.c | |
| parent | 1049cb478783c74ca8c99ef70e7d2bf920b9335b (diff) | |
| parent | 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/sata_sil24.c
Diffstat (limited to 'net/sysctl_net.c')
| -rw-r--r-- | net/sysctl_net.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 55538f6b60ff..58a1b6b42ddd 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c | |||
| @@ -37,14 +37,6 @@ struct ctl_table net_table[] = { | |||
| 37 | .mode = 0555, | 37 | .mode = 0555, |
| 38 | .child = core_table, | 38 | .child = core_table, |
| 39 | }, | 39 | }, |
| 40 | #ifdef CONFIG_NET | ||
| 41 | { | ||
| 42 | .ctl_name = NET_ETHER, | ||
| 43 | .procname = "ethernet", | ||
| 44 | .mode = 0555, | ||
| 45 | .child = ether_table, | ||
| 46 | }, | ||
| 47 | #endif | ||
| 48 | #ifdef CONFIG_INET | 40 | #ifdef CONFIG_INET |
| 49 | { | 41 | { |
| 50 | .ctl_name = NET_IPV4, | 42 | .ctl_name = NET_IPV4, |