diff --git a/[refs] b/[refs] index 37680eb790b8..9bbf0aad0cf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ae4efbcd2611562a8b93596be034e63495706a5 +refs/heads/master: d44c3a2e0e5d2c75d22284462c66d166604b1f18 diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 6b1af549b2ff..533cc411ee48 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -26,6 +26,15 @@ menuconfig NETDEVICES # that for each of the symbols. if NETDEVICES +config COMPAT_NET_DEV_OPS + default y + bool "Enable older network device API compatiablity" + ---help--- + This option enables kernel compatiability with older network devices + that do not use net_device_ops interface. + + If unsure, say Y. + config IFB tristate "Intermediate Functional Block support" depends on NET_CLS_ACT diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig index c9fdcd7e71ea..93998a9c39c2 100644 --- a/trunk/net/Kconfig +++ b/trunk/net/Kconfig @@ -24,9 +24,6 @@ if NET menu "Networking options" -config COMPAT_NET_DEV_OPS - def_bool y - source "net/packet/Kconfig" source "net/unix/Kconfig" source "net/xfrm/Kconfig"