Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[powerpc.git] / drivers / s390 / net / Makefile

diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile
index 90d4d0e..bbe3ab2 100644 (file)
--- a/drivers/s390/net/Makefile
+++ b/drivers/s390/net/Makefile
@@ -2,9 +2,8 @@
 # S/390 network devices
 #
 
-ctc-objs := ctcmain.o ctctty.o ctcdbug.o
+ctc-objs := ctcmain.o ctcdbug.o
 
-obj-$(CONFIG_IUCV) += iucv.o
 obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o
 obj-$(CONFIG_SMSGIUCV) += smsgiucv.o
 obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o