diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 10:27:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 10:27:39 -0700 |
commit | f49809fe9b39e22b0f6f75c86295ce216ce3e374 (patch) | |
tree | 05f8c05ee71307c9ab02663cfaa5f08a21c6629f /drivers/s390/net/Makefile | |
parent | cdbbde14cb55dd10771ce79154f787322d88411b (diff) | |
parent | c1ef1f351db70ad60c793b8218dd9f6739cfd66d (diff) |
Automatic merge of 'for-linus' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/s390/net/Makefile')
-rw-r--r-- | drivers/s390/net/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile index 7cabb80a2e41..90d4d0ef3dd4 100644 --- a/drivers/s390/net/Makefile +++ b/drivers/s390/net/Makefile @@ -9,6 +9,7 @@ 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 -qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o qeth_tso.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 obj-$(CONFIG_QETH) += qeth.o |