Merge branch 'bcmring/removal' into next/multiplatform

[~andy/linux] / drivers / md / multipath.h

diff --git a/drivers/md/multipath.h b/drivers/md/multipath.h
index 350a631b6c9338e6f873ce210e412a939b8cb4dd..717c60f628982ebf659c7aa00bd1608e0fc8ddf0 100644 (file)
--- a/drivers/md/multipath.h
+++ b/drivers/md/multipath.h
@@ -5,7 +5,7 @@ struct multipath_info {
        struct md_rdev  *rdev;
 };
 
-struct multipath_private_data {
+struct mpconf {
        struct mddev                    *mddev;
        struct multipath_info   *multipaths;
        int                     raid_disks;
@@ -15,8 +15,6 @@ struct multipath_private_data {
        mempool_t               *pool;
 };
 
-typedef struct multipath_private_data multipath_conf_t;
-
 /*
  * this is our 'private' 'collective' MULTIPATH buffer head.
  * it contains information about what kind of IO operations were started