patch-2.4.3 linux/include/asm-s390x/dasd.h

Next file: linux/include/asm-s390x/lowcore.h
Previous file: linux/include/asm-s390x/ccwcache.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.2/linux/include/asm-s390x/dasd.h linux/include/asm-s390x/dasd.h
@@ -203,7 +203,7 @@
 typedef ccw_req_t *(*dasd_erp_action_fn_t) (ccw_req_t * cqr);
 typedef ccw_req_t *(*dasd_erp_postaction_fn_t) (ccw_req_t * cqr);
 
-typedef int (*dasd_ck_id_fn_t) (dev_info_t *);
+typedef int (*dasd_ck_id_fn_t) (s390_dev_info_t *);
 typedef int (*dasd_ck_characteristics_fn_t) (struct dasd_device_t *);
 typedef int (*dasd_fill_geometry_fn_t) (struct dasd_device_t *, struct hd_geometry *);
 typedef ccw_req_t *(*dasd_format_fn_t) (struct dasd_device_t *, struct format_data_t *);
@@ -269,7 +269,7 @@
 } dasd_profile_info_t;
 
 typedef struct dasd_device_t {
-	dev_info_t devinfo;
+	s390_dev_info_t devinfo;
 	dasd_discipline_t *discipline;
 	int level;
         int open_count;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)