summaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-17 01:03:17 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-17 01:03:17 -0400
commitecf7f354e228ac9e80d2d25a0a0cbc8c876e9ab4 (patch)
tree14c83181a6998c2e230c9746d131b48eaf4e978d /drivers/s390/net/Makefile
parentc233289c29369dba7177ca873e9b8ed457af2a78 (diff)
parent8b98a37c4b00f3fbcf162281bd4595777e61241b (diff)
downloadtalos-obmc-linux-ecf7f354e228ac9e80d2d25a0a0cbc8c876e9ab4.tar.gz
talos-obmc-linux-ecf7f354e228ac9e80d2d25a0a0cbc8c876e9ab4.zip
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/s390/net/Makefile')
-rw-r--r--drivers/s390/net/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile
index 6775a837d646..4777e36a922f 100644
--- a/drivers/s390/net/Makefile
+++ b/drivers/s390/net/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_SMSGIUCV) += smsgiucv.o
obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o
obj-$(CONFIG_LCS) += lcs.o cu3088.o
obj-$(CONFIG_CLAW) += claw.o cu3088.o
-obj-$(CONFIG_MPC) += ctcmpc.o fsm.o cu3088.o
qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o
qeth-$(CONFIG_PROC_FS) += qeth_proc.o
obj-$(CONFIG_QETH) += qeth.o
OpenPOWER on IntegriCloud