1 files changed, 22 insertions, 18 deletions

diff --git a/net/rxrpc/Makefile b/net/rxrpc/Makefile
index 6efcb6f162a0..c46867c61c98 100644
--- a/net/rxrpc/Makefile
+++ b/net/rxrpc/Makefile
@@ -1,25 +1,29 @@
 #
-# Makefile for Linux kernel Rx RPC
+# Makefile for Linux kernel RxRPC
 #
 
-#CFLAGS += -finstrument-functions
-
-rxrpc-objs := \
-        call.o \
-        connection.o \
-        krxiod.o \
-        krxsecd.o \
-        krxtimod.o \
-        main.o \
-        peer.o \
-        rxrpc_syms.o \
-        transport.o
+af-rxrpc-objs := \
+        af_rxrpc.o \
+        ar-accept.o \
+        ar-ack.o \
+        ar-call.o \
+        ar-connection.o \
+        ar-connevent.o \
+        ar-error.o \
+        ar-input.o \
+        ar-key.o \
+        ar-local.o \
+        ar-output.o \
+        ar-peer.o \
+        ar-recvmsg.o \
+        ar-security.o \
+        ar-skbuff.o \
+        ar-transport.o
 
 ifeq ($(CONFIG_PROC_FS),y)
-rxrpc-objs += proc.o
-endif
-ifeq ($(CONFIG_SYSCTL),y)
-rxrpc-objs += sysctl.o
+af-rxrpc-objs += ar-proc.o
 endif
 
-obj-$(CONFIG_RXRPC) := rxrpc.o
+obj-$(CONFIG_AF_RXRPC) += af-rxrpc.o
+
+obj-$(CONFIG_RXKAD) += rxkad.o