[Blackfin] arch: Add proper SW System Reset delay sequence

[linux-2.6] / drivers / ide / ide-cd.h

diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h
index ad1f2ed14a3723cbcec3081341487e7d784c494c..1b302fe2724d3d451f24278c61ecbab901792a9c 100644 (file)
--- a/drivers/ide/ide-cd.h
+++ b/drivers/ide/ide-cd.h
@@ -91,7 +91,8 @@ struct ide_cd_config_flags {
        __u8 close_tray         : 1; /* can close the tray */
        __u8 writing            : 1; /* pseudo write in progress */
        __u8 mo_drive           : 1; /* drive is an MO device */
-       __u8 reserved           : 2;
+       __u8 no_speed_select    : 1; /* SET_CD_SPEED command is unsupported. */
+       __u8 reserved           : 1;
        byte max_speed;              /* Max speed of the drive */
 };
 #define CDROM_CONFIG_FLAGS(drive) (&(((struct cdrom_info *)(drive->driver_data))->config_flags))
@@ -498,8 +499,6 @@ struct cdrom_info {
  * Descriptions of ATAPI error codes.
  */
 
-#define ARY_LEN(a) ((sizeof(a) / sizeof(a[0])))
-
 /* This stuff should be in cdrom.h, since it is now generic... */
 
 /* ATAPI sense keys (from table 140 of ATAPI 2.6) */