Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

1 files changed, 5 insertions, 2 deletions

diff --git a/net/9p/Makefile b/net/9p/Makefile
index 519219480db1..198a640d53a6 100644
--- a/net/9p/Makefile
+++ b/net/9p/Makefile
@@ -1,14 +1,17 @@
 obj-$(CONFIG_NET_9P) := 9pnet.o
 obj-$(CONFIG_NET_9P_VIRTIO) += 9pnet_virtio.o
+obj-$(CONFIG_NET_9P_RDMA) += 9pnet_rdma.o
 
 9pnet-objs := \
         mod.o \
         client.o \
-        conv.o \
         error.o \
-        fcprint.o \
         util.o \
+        protocol.o \
         trans_fd.o \
 
 9pnet_virtio-objs := \
         trans_virtio.o \
+
+9pnet_rdma-objs := \
+        trans_rdma.o \