From: Bartlomiej Zolnierkiewicz Date: Fri, 1 Feb 2008 22:09:19 +0000 (+0100) Subject: ide-cd: remove unused struct atapi_cdrom_subchnl X-Git-Tag: v2.6.25-rc1~1078^2~84 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f17b0e02c0035b90c4e943f6e2cca840f82dce0f;p=linux-2.6-omap-h63xx.git ide-cd: remove unused struct atapi_cdrom_subchnl Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz --- diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index 1e138c9278d..e6f21977254 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h @@ -145,38 +145,6 @@ struct atapi_toc { /* One extra for the leadout. */ }; - -/* This structure is annoyingly close to, but not identical with, - the cdrom_subchnl structure from cdrom.h. */ -struct atapi_cdrom_subchnl { - u_char acdsc_reserved; - u_char acdsc_audiostatus; - u_short acdsc_length; - u_char acdsc_format; - -#if defined(__BIG_ENDIAN_BITFIELD) - u_char acdsc_ctrl: 4; - u_char acdsc_adr: 4; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - u_char acdsc_adr: 4; - u_char acdsc_ctrl: 4; -#else -#error "Please fix " -#endif - u_char acdsc_trk; - u_char acdsc_ind; - union { - struct atapi_msf msf; - int lba; - } acdsc_absaddr; - union { - struct atapi_msf msf; - int lba; - } acdsc_reladdr; -}; - - - /* This should probably go into cdrom.h along with the other * generic stuff now in the Mt. Fuji spec. */