diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-22 18:22:42 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-22 18:22:42 -0700 |
commit | 76fef2b6bffa13ad7ccd54c0493b053295721b9a (patch) | |
tree | f4509477d413398b7155fb3c35453ab26bd81bce /drivers/s390/net/Makefile | |
parent | 817bc4db7794d6dc6594265ddea88d2b839cf2f8 (diff) | |
parent | ef8500457b29eed13d03ff19af36d810308e57b7 (diff) | |
download | kernel_samsung_smdk4412-76fef2b6bffa13ad7ccd54c0493b053295721b9a.zip kernel_samsung_smdk4412-76fef2b6bffa13ad7ccd54c0493b053295721b9a.tar.gz kernel_samsung_smdk4412-76fef2b6bffa13ad7ccd54c0493b053295721b9a.tar.bz2 |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Conflicts:
drivers/s390/net/qeth_main.c
Diffstat (limited to 'drivers/s390/net/Makefile')
-rw-r--r-- | drivers/s390/net/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile index bbe3ab2..6382c04 100644 --- a/drivers/s390/net/Makefile +++ b/drivers/s390/net/Makefile @@ -2,13 +2,15 @@ # S/390 network devices # -ctc-objs := ctcmain.o ctcdbug.o - +ctcm-y += ctcm_main.o ctcm_fsms.o ctcm_mpc.o ctcm_sysfs.o ctcm_dbug.o +obj-$(CONFIG_CTCM) += ctcm.o fsm.o cu3088.o obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o 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 -qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o -qeth-$(CONFIG_PROC_FS) += qeth_proc.o +qeth-y += qeth_core_sys.o qeth_core_main.o qeth_core_mpc.o qeth_core_offl.o obj-$(CONFIG_QETH) += qeth.o +qeth_l2-y += qeth_l2_main.o +obj-$(CONFIG_QETH_L2) += qeth_l2.o +qeth_l3-y += qeth_l3_main.o qeth_l3_sys.o +obj-$(CONFIG_QETH_L3) += qeth_l3.o |