Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-pull

[linux-2.6] / drivers / s390 / cio / chp.h

diff --git a/drivers/s390/cio/chp.h b/drivers/s390/cio/chp.h
index dffe2771ddacded5d8b0dd886589255d1767c617..26c3d22461764b56630958bbbfa6cb9714b166b0 100644 (file)
--- a/drivers/s390/cio/chp.h
+++ b/drivers/s390/cio/chp.h
@@ -24,7 +24,7 @@
 #define CHP_VARY_ON 2
 #define CHP_VARY_OFF 3
 
-struct res_acc_data {
+struct chp_link {
        struct chp_id chpid;
        u32 fla_mask;
        u16 fla;
@@ -60,5 +60,5 @@ int chp_new(struct chp_id chpid);
 void chp_cfg_schedule(struct chp_id chpid, int configure);
 void chp_cfg_cancel_deconfigure(struct chp_id chpid);
 int chp_info_get_status(struct chp_id chpid);
-int chp_ssd_get_mask(struct chsc_ssd_info *, struct res_acc_data *);
+int chp_ssd_get_mask(struct chsc_ssd_info *, struct chp_link *);
 #endif /* S390_CHP_H */