1 files changed, 37 insertions, 35 deletions
diff --git a/include/linux/affs_hardblocks.h b/include/linux/affs_hardblocks.h
index 3fb869939d82..f1b948c1f592 100644
--- a/include/linux/affs_hardblocks.h
+++ b/include/linux/affs_hardblocks.h
@@ -1,45 +1,47 @@
 #ifndef AFFS_HARDBLOCKS_H
 #define AFFS_HARDBLOCKS_H
+#include <linux/types.h>
 /* Just the needed definitions for the RDB of an Amiga HD. */
 struct RigidDiskBlock {
-        u32     rdb_ID;
+        __u32   rdb_ID;
        __be32  rdb_SummedLongs;
-        s32     rdb_ChkSum;
+        __s32   rdb_ChkSum;
-        u32     rdb_HostID;
+        __u32   rdb_HostID;
        __be32  rdb_BlockBytes;
-        u32     rdb_Flags;
+        __u32   rdb_Flags;
-        u32     rdb_BadBlockList;
+        __u32   rdb_BadBlockList;
        __be32  rdb_PartitionList;
-        u32     rdb_FileSysHeaderList;
+        __u32   rdb_FileSysHeaderList;
-        u32     rdb_DriveInit;
+        __u32   rdb_DriveInit;
-        u32     rdb_Reserved1[6];
+        __u32   rdb_Reserved1[6];
-        u32     rdb_Cylinders;
+        __u32   rdb_Cylinders;
-        u32     rdb_Sectors;
+        __u32   rdb_Sectors;
-        u32     rdb_Heads;
+        __u32   rdb_Heads;
-        u32     rdb_Interleave;
+        __u32   rdb_Interleave;
-        u32     rdb_Park;
+        __u32   rdb_Park;
-        u32     rdb_Reserved2[3];
+        __u32   rdb_Reserved2[3];
-        u32     rdb_WritePreComp;
+        __u32   rdb_WritePreComp;
-        u32     rdb_ReducedWrite;
+        __u32   rdb_ReducedWrite;
-        u32     rdb_StepRate;
+        __u32   rdb_StepRate;
-        u32     rdb_Reserved3[5];
+        __u32   rdb_Reserved3[5];
-        u32     rdb_RDBBlocksLo;
+        __u32   rdb_RDBBlocksLo;
-        u32     rdb_RDBBlocksHi;
+        __u32   rdb_RDBBlocksHi;
-        u32     rdb_LoCylinder;
+        __u32   rdb_LoCylinder;
-        u32     rdb_HiCylinder;
+        __u32   rdb_HiCylinder;
-        u32     rdb_CylBlocks;
+        __u32   rdb_CylBlocks;
-        u32     rdb_AutoParkSeconds;
+        __u32   rdb_AutoParkSeconds;
-        u32     rdb_HighRDSKBlock;
+        __u32   rdb_HighRDSKBlock;
-        u32     rdb_Reserved4;
+        __u32   rdb_Reserved4;
        char    rdb_DiskVendor[8];
        char    rdb_DiskProduct[16];
        char    rdb_DiskRevision[4];
        char    rdb_ControllerVendor[8];
        char    rdb_ControllerProduct[16];
        char    rdb_ControllerRevision[4];
-        u32     rdb_Reserved5[10];
+        __u32   rdb_Reserved5[10];
 };
 #define IDNAME_RIGIDDISK        0x5244534B      /* "RDSK" */
@@ -47,16 +49,16 @@ struct RigidDiskBlock {
 struct PartitionBlock {
        __be32  pb_ID;
        __be32  pb_SummedLongs;
-        s32     pb_ChkSum;
+        __s32   pb_ChkSum;
-        u32     pb_HostID;
+        __u32   pb_HostID;
        __be32  pb_Next;
-        u32     pb_Flags;
+        __u32   pb_Flags;
-        u32     pb_Reserved1[2];
+        __u32   pb_Reserved1[2];
-        u32     pb_DevFlags;
+        __u32   pb_DevFlags;
-        u8      pb_DriveName[32];
+        __u8    pb_DriveName[32];
-        u32     pb_Reserved2[15];
+        __u32   pb_Reserved2[15];
        __be32  pb_Environment[17];
-        u32     pb_EReserved[15];
+        __u32   pb_EReserved[15];
 };
 #define IDNAME_PARTITION        0x50415254      /* "PART" */

diff --git a/include/linux/affs_hardblocks.h b/include/linux/affs_hardblocks.h index 3fb869939d82..f1b948c1f592 100644 --- a/include/linux/affs_hardblocks.h +++ b/include/linux/affs_hardblocks.h
@@ -1,45 +1,47 @@
1	#ifndef AFFS_HARDBLOCKS_H	1	#ifndef AFFS_HARDBLOCKS_H
2	#define AFFS_HARDBLOCKS_H	2	#define AFFS_HARDBLOCKS_H
3		3
		4	#include <linux/types.h>
		5
4	/* Just the needed definitions for the RDB of an Amiga HD. */	6	/* Just the needed definitions for the RDB of an Amiga HD. */
5		7
6	struct RigidDiskBlock {	8	struct RigidDiskBlock {
7	u32 rdb_ID;	9	__u32 rdb_ID;
8	__be32 rdb_SummedLongs;	10	__be32 rdb_SummedLongs;
9	s32 rdb_ChkSum;	11	__s32 rdb_ChkSum;
10	u32 rdb_HostID;	12	__u32 rdb_HostID;
11	__be32 rdb_BlockBytes;	13	__be32 rdb_BlockBytes;
12	u32 rdb_Flags;	14	__u32 rdb_Flags;
13	u32 rdb_BadBlockList;	15	__u32 rdb_BadBlockList;
14	__be32 rdb_PartitionList;	16	__be32 rdb_PartitionList;
15	u32 rdb_FileSysHeaderList;	17	__u32 rdb_FileSysHeaderList;
16	u32 rdb_DriveInit;	18	__u32 rdb_DriveInit;
17	u32 rdb_Reserved1[6];	19	__u32 rdb_Reserved1[6];
18	u32 rdb_Cylinders;	20	__u32 rdb_Cylinders;
19	u32 rdb_Sectors;	21	__u32 rdb_Sectors;
20	u32 rdb_Heads;	22	__u32 rdb_Heads;
21	u32 rdb_Interleave;	23	__u32 rdb_Interleave;
22	u32 rdb_Park;	24	__u32 rdb_Park;
23	u32 rdb_Reserved2[3];	25	__u32 rdb_Reserved2[3];
24	u32 rdb_WritePreComp;	26	__u32 rdb_WritePreComp;
25	u32 rdb_ReducedWrite;	27	__u32 rdb_ReducedWrite;
26	u32 rdb_StepRate;	28	__u32 rdb_StepRate;
27	u32 rdb_Reserved3[5];	29	__u32 rdb_Reserved3[5];
28	u32 rdb_RDBBlocksLo;	30	__u32 rdb_RDBBlocksLo;
29	u32 rdb_RDBBlocksHi;	31	__u32 rdb_RDBBlocksHi;
30	u32 rdb_LoCylinder;	32	__u32 rdb_LoCylinder;
31	u32 rdb_HiCylinder;	33	__u32 rdb_HiCylinder;
32	u32 rdb_CylBlocks;	34	__u32 rdb_CylBlocks;
33	u32 rdb_AutoParkSeconds;	35	__u32 rdb_AutoParkSeconds;
34	u32 rdb_HighRDSKBlock;	36	__u32 rdb_HighRDSKBlock;
35	u32 rdb_Reserved4;	37	__u32 rdb_Reserved4;
36	char rdb_DiskVendor[8];	38	char rdb_DiskVendor[8];
37	char rdb_DiskProduct[16];	39	char rdb_DiskProduct[16];
38	char rdb_DiskRevision[4];	40	char rdb_DiskRevision[4];
39	char rdb_ControllerVendor[8];	41	char rdb_ControllerVendor[8];
40	char rdb_ControllerProduct[16];	42	char rdb_ControllerProduct[16];
41	char rdb_ControllerRevision[4];	43	char rdb_ControllerRevision[4];
42	u32 rdb_Reserved5[10];	44	__u32 rdb_Reserved5[10];
43	};	45	};
44		46
45	#define IDNAME_RIGIDDISK 0x5244534B /* "RDSK" */	47	#define IDNAME_RIGIDDISK 0x5244534B /* "RDSK" */
@@ -47,16 +49,16 @@ struct RigidDiskBlock {
47	struct PartitionBlock {	49	struct PartitionBlock {
48	__be32 pb_ID;	50	__be32 pb_ID;
49	__be32 pb_SummedLongs;	51	__be32 pb_SummedLongs;
50	s32 pb_ChkSum;	52	__s32 pb_ChkSum;
51	u32 pb_HostID;	53	__u32 pb_HostID;
52	__be32 pb_Next;	54	__be32 pb_Next;
53	u32 pb_Flags;	55	__u32 pb_Flags;
54	u32 pb_Reserved1[2];	56	__u32 pb_Reserved1[2];
55	u32 pb_DevFlags;	57	__u32 pb_DevFlags;
56	u8 pb_DriveName[32];	58	__u8 pb_DriveName[32];
57	u32 pb_Reserved2[15];	59	__u32 pb_Reserved2[15];
58	__be32 pb_Environment[17];	60	__be32 pb_Environment[17];
59	u32 pb_EReserved[15];	61	__u32 pb_EReserved[15];
60	};	62	};
61		63
62	#define IDNAME_PARTITION 0x50415254 /* "PART" */	64	#define IDNAME_PARTITION 0x50415254 /* "PART" */