[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>

diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile
index 7cabb80a2e4144ef77210e5576124009baa747f3..85b590c5701d2deef3a0638d4792d16d2ab0564b 100644 (file)
--- 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
+obj-$(CONFIG_CLAW) += claw.o cu3088.o
 qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o qeth_tso.o
 qeth-$(CONFIG_PROC_FS) += qeth_proc.o
 obj-$(CONFIG_QETH) += qeth.o

diff --git a/drivers/s390/net/cu3088.c b/drivers/s390/net/cu3088.c
index 1b0a9f16024c5929f0062972d431fd33088bb1d7..0075894c71db0e09086efd97b55111f0a374bbe0 100644 (file)
--- a/drivers/s390/net/cu3088.c
+++ b/drivers/s390/net/cu3088.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cu3088.c,v 1.34 2004/06/15 13:16:27 pavlic Exp $
+ * $Id: cu3088.c,v 1.35 2005/03/30 19:28:52 richtera Exp $
  *
  * CTC / LCS ccw_device driver
  *
@@ -39,6 +39,7 @@ const char *cu3088_type[] = {
        "FICON channel",
        "P390 LCS card",
        "OSA LCS card",
+       "CLAW channel device",
        "unknown channel type",
        "unsupported channel type",
 };
@@ -51,6 +52,7 @@ static struct ccw_device_id cu3088_ids[] = {
        { CCW_DEVICE(0x3088, 0x1e), .driver_info = channel_type_ficon },
        { CCW_DEVICE(0x3088, 0x01), .driver_info = channel_type_p390 },
        { CCW_DEVICE(0x3088, 0x60), .driver_info = channel_type_osa2 },
+       { CCW_DEVICE(0x3088, 0x61), .driver_info = channel_type_claw },
        { /* end of list */ }
 };
 

diff --git a/drivers/s390/net/cu3088.h b/drivers/s390/net/cu3088.h
index 0ec49a8b3adcc5a2e697d01313120e18ad43fc4a..1753661f702a196325968df22cffec4485743f5e 100644 (file)
--- a/drivers/s390/net/cu3088.h
+++ b/drivers/s390/net/cu3088.h
@@ -23,6 +23,9 @@ enum channel_types {
        /* Device is a OSA2 card */
        channel_type_osa2,
 
+       /* Device is a CLAW channel device */
+       channel_type_claw,
+
        /* Device is a channel, but we don't know
         * anything about it */
        channel_type_unknown,