patch-2.2.17 linux/drivers/s390/block/dasd_3990_erp.c

• Lines: 25
• Date: Mon Sep 4 18:39:20 2000
• Orig file: v2.2.16/drivers/s390/block/dasd_3990_erp.c
• Orig date: Mon Sep 4 18:37:42 2000

diff -u --recursive --new-file v2.2.16/drivers/s390/block/dasd_3990_erp.c linux/drivers/s390/block/dasd_3990_erp.c
@@ -6,10 +6,13 @@
  * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 2000
  */
 
-#include <linux/dasd.h>
-#include "dasd_erp.h"
+#include <asm/ccwcache.h>
+#include <asm/dasd.h>
 
+#ifdef PRINTK_HEADER
+#undef PRINTK_HEADER
 #define PRINTK_HEADER "dasd_erp(3990)"
+#endif /* PRINTK_HEADER */
 
 /*
  * DASD_3990_ERP_EXAMINE_32 
@@ -95,7 +98,7 @@
  *   dasd_era_recover   for all others.
  */
 dasd_era_t
-dasd_3990_erp_examine (cqr_t * cqr, devstat_t * stat)
+dasd_3990_erp_examine (ccw_req_t * cqr, devstat_t * stat)
 {
 
 	char *sense = stat->ii.sense.data;