diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-23 05:04:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 10:43:00 -0400 |
commit | 98317f1271e7fd472983b013c76df6cc15fbef22 (patch) | |
tree | 98aa4a3193044e57fbe918850e2b9eed13904c30 | |
parent | 5a232eafedc385249ef1931d186169f9eed2ad93 (diff) |
[PATCH] m68k: Remove some unused definitions in zorro.h
These definitions have long been superseded by asm-offsets.h
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | include/linux/zorro.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/include/linux/zorro.h b/include/linux/zorro.h index 2f135cf6eef1..913bfc226dda 100644 --- a/include/linux/zorro.h +++ b/include/linux/zorro.h | |||
@@ -11,8 +11,6 @@ | |||
11 | #ifndef _LINUX_ZORRO_H | 11 | #ifndef _LINUX_ZORRO_H |
12 | #define _LINUX_ZORRO_H | 12 | #define _LINUX_ZORRO_H |
13 | 13 | ||
14 | #ifndef __ASSEMBLY__ | ||
15 | |||
16 | #include <linux/device.h> | 14 | #include <linux/device.h> |
17 | 15 | ||
18 | 16 | ||
@@ -112,45 +110,6 @@ struct ConfigDev { | |||
112 | __u32 cd_Unused[4]; /* for whatever the driver wants */ | 110 | __u32 cd_Unused[4]; /* for whatever the driver wants */ |
113 | } __attribute__ ((packed)); | 111 | } __attribute__ ((packed)); |
114 | 112 | ||
115 | #else /* __ASSEMBLY__ */ | ||
116 | |||
117 | LN_Succ = 0 | ||
118 | LN_Pred = LN_Succ+4 | ||
119 | LN_Type = LN_Pred+4 | ||
120 | LN_Pri = LN_Type+1 | ||
121 | LN_Name = LN_Pri+1 | ||
122 | LN_sizeof = LN_Name+4 | ||
123 | |||
124 | ER_Type = 0 | ||
125 | ER_Product = ER_Type+1 | ||
126 | ER_Flags = ER_Product+1 | ||
127 | ER_Reserved03 = ER_Flags+1 | ||
128 | ER_Manufacturer = ER_Reserved03+1 | ||
129 | ER_SerialNumber = ER_Manufacturer+2 | ||
130 | ER_InitDiagVec = ER_SerialNumber+4 | ||
131 | ER_Reserved0c = ER_InitDiagVec+2 | ||
132 | ER_Reserved0d = ER_Reserved0c+1 | ||
133 | ER_Reserved0e = ER_Reserved0d+1 | ||
134 | ER_Reserved0f = ER_Reserved0e+1 | ||
135 | ER_sizeof = ER_Reserved0f+1 | ||
136 | |||
137 | CD_Node = 0 | ||
138 | CD_Flags = CD_Node+LN_sizeof | ||
139 | CD_Pad = CD_Flags+1 | ||
140 | CD_Rom = CD_Pad+1 | ||
141 | CD_BoardAddr = CD_Rom+ER_sizeof | ||
142 | CD_BoardSize = CD_BoardAddr+4 | ||
143 | CD_SlotAddr = CD_BoardSize+4 | ||
144 | CD_SlotSize = CD_SlotAddr+2 | ||
145 | CD_Driver = CD_SlotSize+2 | ||
146 | CD_NextCD = CD_Driver+4 | ||
147 | CD_Unused = CD_NextCD+4 | ||
148 | CD_sizeof = CD_Unused+(4*4) | ||
149 | |||
150 | #endif /* __ASSEMBLY__ */ | ||
151 | |||
152 | #ifndef __ASSEMBLY__ | ||
153 | |||
154 | #define ZORRO_NUM_AUTO 16 | 113 | #define ZORRO_NUM_AUTO 16 |
155 | 114 | ||
156 | #ifdef __KERNEL__ | 115 | #ifdef __KERNEL__ |
@@ -290,7 +249,6 @@ extern DECLARE_BITMAP(zorro_unused_z2ram, 128); | |||
290 | #define Z2RAM_CHUNKSHIFT (16) | 249 | #define Z2RAM_CHUNKSHIFT (16) |
291 | 250 | ||
292 | 251 | ||
293 | #endif /* !__ASSEMBLY__ */ | ||
294 | #endif /* __KERNEL__ */ | 252 | #endif /* __KERNEL__ */ |
295 | 253 | ||
296 | #endif /* _LINUX_ZORRO_H */ | 254 | #endif /* _LINUX_ZORRO_H */ |