diff options
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/ipx/Kconfig (renamed from net/ipx/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/staging/ipx/Makefile (renamed from net/ipx/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/ipx/TODO | 4 | ||||
| -rw-r--r-- | drivers/staging/ipx/af_ipx.c (renamed from net/ipx/af_ipx.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/ipx/ipx_proc.c (renamed from net/ipx/ipx_proc.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/ipx/ipx_route.c (renamed from net/ipx/ipx_route.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/ipx/pe2.c (renamed from net/ipx/pe2.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/ipx/sysctl_net_ipx.c (renamed from net/ipx/sysctl_net_ipx.c) | 0 | ||||
| -rw-r--r-- | net/Kconfig | 1 | ||||
| -rw-r--r-- | net/Makefile | 1 |
13 files changed, 8 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aa71ab52fd76..56cc7261c7e4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7311,9 +7311,8 @@ F: drivers/tty/ipwireless/ IPX NETWORK LAYER L: netdev@vger.kernel.org S: Odd fixes -F: include/net/ipx.h F: include/uapi/linux/ipx.h -F: net/ipx/ +F: drivers/staging/ipx/ IRDA SUBSYSTEM M: Samuel Ortiz <samuel@sortiz.org> diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 554683912cff..3744640bed5a 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -26,6 +26,8 @@ if STAGING source "drivers/staging/irda/net/Kconfig" +source "drivers/staging/ipx/Kconfig" + source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/comedi/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 6e536020029a..f4c0506470ff 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -3,6 +3,7 @@ obj-y += media/ obj-y += typec/ +obj-$(CONFIG_IPX) += ipx/ obj-$(CONFIG_IRDA) += irda/net/ obj-$(CONFIG_IRDA) += irda/drivers/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ diff --git a/net/ipx/Kconfig b/drivers/staging/ipx/Kconfig index e9ad0062fbb6..e9ad0062fbb6 100644 --- a/net/ipx/Kconfig +++ b/drivers/staging/ipx/Kconfig diff --git a/net/ipx/Makefile b/drivers/staging/ipx/Makefile index 440fafa9fd07..440fafa9fd07 100644 --- a/net/ipx/Makefile +++ b/drivers/staging/ipx/Makefile diff --git a/drivers/staging/ipx/TODO b/drivers/staging/ipx/TODO new file mode 100644 index 000000000000..80db5d968264 --- /dev/null +++ b/drivers/staging/ipx/TODO @@ -0,0 +1,4 @@ +The ipx code will be removed soon from the kernel tree as it is old and +obsolete and broken. + +Don't worry about fixing up anything here, it's not needed. diff --git a/net/ipx/af_ipx.c b/drivers/staging/ipx/af_ipx.c index d21a9d128d3e..d21a9d128d3e 100644 --- a/net/ipx/af_ipx.c +++ b/drivers/staging/ipx/af_ipx.c diff --git a/net/ipx/ipx_proc.c b/drivers/staging/ipx/ipx_proc.c index 38a3d51d9ead..38a3d51d9ead 100644 --- a/net/ipx/ipx_proc.c +++ b/drivers/staging/ipx/ipx_proc.c diff --git a/net/ipx/ipx_route.c b/drivers/staging/ipx/ipx_route.c index 3cf93aa9f284..3cf93aa9f284 100644 --- a/net/ipx/ipx_route.c +++ b/drivers/staging/ipx/ipx_route.c diff --git a/net/ipx/pe2.c b/drivers/staging/ipx/pe2.c index ba7d4214bbff..ba7d4214bbff 100644 --- a/net/ipx/pe2.c +++ b/drivers/staging/ipx/pe2.c diff --git a/net/ipx/sysctl_net_ipx.c b/drivers/staging/ipx/sysctl_net_ipx.c index c3eef457db88..c3eef457db88 100644 --- a/net/ipx/sysctl_net_ipx.c +++ b/drivers/staging/ipx/sysctl_net_ipx.c diff --git a/net/Kconfig b/net/Kconfig index 9dba2715919d..ff71ba0f6c27 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -212,7 +212,6 @@ source "net/dsa/Kconfig" source "net/8021q/Kconfig" source "net/decnet/Kconfig" source "net/llc/Kconfig" -source "net/ipx/Kconfig" source "drivers/net/appletalk/Kconfig" source "net/x25/Kconfig" source "net/lapb/Kconfig" diff --git a/net/Makefile b/net/Makefile index 14fede520840..a6147c61b174 100644 --- a/net/Makefile +++ b/net/Makefile @@ -24,7 +24,6 @@ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_BRIDGE) += bridge/ obj-$(CONFIG_NET_DSA) += dsa/ -obj-$(CONFIG_IPX) += ipx/ obj-$(CONFIG_ATALK) += appletalk/ obj-$(CONFIG_X25) += x25/ obj-$(CONFIG_LAPB) += lapb/ |