Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / md / linear.h

diff --git a/drivers/md/linear.h b/drivers/md/linear.h
index 2f2da05..b685ddd 100644 (file)
--- a/drivers/md/linear.h
+++ b/drivers/md/linear.h
@@ -2,20 +2,14 @@
 #define _LINEAR_H
 
 struct dev_info {
-       mdk_rdev_t      *rdev;
+       struct md_rdev  *rdev;
        sector_t        end_sector;
 };
 
-typedef struct dev_info dev_info_t;
-
-struct linear_private_data
+struct linear_conf
 {
        struct rcu_head         rcu;
        sector_t                array_sectors;
-       dev_info_t              disks[0];
+       struct dev_info         disks[0];
 };
-
-
-typedef struct linear_private_data linear_conf_t;
-
 #endif