diff options
-rw-r--r-- | drivers/ide/ide-cd.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index 1e138c9278de..e6f219772549 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h | |||
@@ -145,38 +145,6 @@ struct atapi_toc { | |||
145 | /* One extra for the leadout. */ | 145 | /* One extra for the leadout. */ |
146 | }; | 146 | }; |
147 | 147 | ||
148 | |||
149 | /* This structure is annoyingly close to, but not identical with, | ||
150 | the cdrom_subchnl structure from cdrom.h. */ | ||
151 | struct atapi_cdrom_subchnl { | ||
152 | u_char acdsc_reserved; | ||
153 | u_char acdsc_audiostatus; | ||
154 | u_short acdsc_length; | ||
155 | u_char acdsc_format; | ||
156 | |||
157 | #if defined(__BIG_ENDIAN_BITFIELD) | ||
158 | u_char acdsc_ctrl: 4; | ||
159 | u_char acdsc_adr: 4; | ||
160 | #elif defined(__LITTLE_ENDIAN_BITFIELD) | ||
161 | u_char acdsc_adr: 4; | ||
162 | u_char acdsc_ctrl: 4; | ||
163 | #else | ||
164 | #error "Please fix <asm/byteorder.h>" | ||
165 | #endif | ||
166 | u_char acdsc_trk; | ||
167 | u_char acdsc_ind; | ||
168 | union { | ||
169 | struct atapi_msf msf; | ||
170 | int lba; | ||
171 | } acdsc_absaddr; | ||
172 | union { | ||
173 | struct atapi_msf msf; | ||
174 | int lba; | ||
175 | } acdsc_reladdr; | ||
176 | }; | ||
177 | |||
178 | |||
179 | |||
180 | /* This should probably go into cdrom.h along with the other | 148 | /* This should probably go into cdrom.h along with the other |
181 | * generic stuff now in the Mt. Fuji spec. | 149 | * generic stuff now in the Mt. Fuji spec. |
182 | */ | 150 | */ |