diff options
author | Frank Pavlic <pavlic@de.ibm.com> | 2005-05-12 14:17:46 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-15 18:06:16 -0400 |
commit | 321de3c8cc12bdff073c23524aa1f6ed47cbeee4 (patch) | |
tree | db8b28572d8a0dc82fb66ca6134a2b037c629775 /drivers/s390 | |
parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) |
[PATCH] s390: claw driver wiring
[patch 1/10] s390: claw driver wiring.
From: Andy Richter <richtera@us.ibm.com>
claw network driver changes:
- Add an entry to the drivers/s390/net Makefile to build the claw driver.
- Add claw channel type to cu3088.
Signed-off-by: Frank Pavlic <pavlic@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/net/Makefile | 1 | ||||
-rw-r--r-- | drivers/s390/net/cu3088.c | 4 | ||||
-rw-r--r-- | drivers/s390/net/cu3088.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile index 7cabb80a2e41..85b590c5701d 100644 --- a/drivers/s390/net/Makefile +++ b/drivers/s390/net/Makefile | |||
@@ -9,6 +9,7 @@ obj-$(CONFIG_NETIUCV) += netiucv.o fsm.o | |||
9 | obj-$(CONFIG_SMSGIUCV) += smsgiucv.o | 9 | obj-$(CONFIG_SMSGIUCV) += smsgiucv.o |
10 | obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o | 10 | obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o |
11 | obj-$(CONFIG_LCS) += lcs.o cu3088.o | 11 | obj-$(CONFIG_LCS) += lcs.o cu3088.o |
12 | obj-$(CONFIG_CLAW) += claw.o cu3088.o | ||
12 | qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o qeth_tso.o | 13 | qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o qeth_tso.o |
13 | qeth-$(CONFIG_PROC_FS) += qeth_proc.o | 14 | qeth-$(CONFIG_PROC_FS) += qeth_proc.o |
14 | obj-$(CONFIG_QETH) += qeth.o | 15 | obj-$(CONFIG_QETH) += qeth.o |
diff --git a/drivers/s390/net/cu3088.c b/drivers/s390/net/cu3088.c index 1b0a9f16024c..0075894c71db 100644 --- a/drivers/s390/net/cu3088.c +++ b/drivers/s390/net/cu3088.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: cu3088.c,v 1.34 2004/06/15 13:16:27 pavlic Exp $ | 2 | * $Id: cu3088.c,v 1.35 2005/03/30 19:28:52 richtera Exp $ |
3 | * | 3 | * |
4 | * CTC / LCS ccw_device driver | 4 | * CTC / LCS ccw_device driver |
5 | * | 5 | * |
@@ -39,6 +39,7 @@ const char *cu3088_type[] = { | |||
39 | "FICON channel", | 39 | "FICON channel", |
40 | "P390 LCS card", | 40 | "P390 LCS card", |
41 | "OSA LCS card", | 41 | "OSA LCS card", |
42 | "CLAW channel device", | ||
42 | "unknown channel type", | 43 | "unknown channel type", |
43 | "unsupported channel type", | 44 | "unsupported channel type", |
44 | }; | 45 | }; |
@@ -51,6 +52,7 @@ static struct ccw_device_id cu3088_ids[] = { | |||
51 | { CCW_DEVICE(0x3088, 0x1e), .driver_info = channel_type_ficon }, | 52 | { CCW_DEVICE(0x3088, 0x1e), .driver_info = channel_type_ficon }, |
52 | { CCW_DEVICE(0x3088, 0x01), .driver_info = channel_type_p390 }, | 53 | { CCW_DEVICE(0x3088, 0x01), .driver_info = channel_type_p390 }, |
53 | { CCW_DEVICE(0x3088, 0x60), .driver_info = channel_type_osa2 }, | 54 | { CCW_DEVICE(0x3088, 0x60), .driver_info = channel_type_osa2 }, |
55 | { CCW_DEVICE(0x3088, 0x61), .driver_info = channel_type_claw }, | ||
54 | { /* end of list */ } | 56 | { /* end of list */ } |
55 | }; | 57 | }; |
56 | 58 | ||
diff --git a/drivers/s390/net/cu3088.h b/drivers/s390/net/cu3088.h index 0ec49a8b3adc..1753661f702a 100644 --- a/drivers/s390/net/cu3088.h +++ b/drivers/s390/net/cu3088.h | |||
@@ -23,6 +23,9 @@ enum channel_types { | |||
23 | /* Device is a OSA2 card */ | 23 | /* Device is a OSA2 card */ |
24 | channel_type_osa2, | 24 | channel_type_osa2, |
25 | 25 | ||
26 | /* Device is a CLAW channel device */ | ||
27 | channel_type_claw, | ||
28 | |||
26 | /* Device is a channel, but we don't know | 29 | /* Device is a channel, but we don't know |
27 | * anything about it */ | 30 | * anything about it */ |
28 | channel_type_unknown, | 31 | channel_type_unknown, |