vserver 1.9.5.x5

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

diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h
index 7a3bcd3..20a01df 100644 (file)
--- a/drivers/ide/ide-cd.h
+++ b/drivers/ide/ide-cd.h
@@ -79,8 +79,6 @@ struct ide_cd_config_flags {
        __u8 dvd                : 1; /* Drive is a DVD-ROM */
        __u8 dvd_r              : 1; /* Drive can write DVD-R */
        __u8 dvd_ram            : 1; /* Drive can write DVD-RAM */
-       __u8 mrw                : 1; /* drive can read mrw */
-       __u8 mrw_w              : 1; /* drive can write mrw */
        __u8 ram                : 1; /* generic WRITE (dvd-ram/mrw) */
        __u8 test_write         : 1; /* Drive can fake writes */
        __u8 supp_disc_present  : 1; /* Changer can report exact contents
@@ -521,7 +519,7 @@ struct cdrom_info {
 
  /* The generic packet command opcodes for CD/DVD Logical Units,
  * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */ 
-const struct {
+static const struct {
        unsigned short packet_command;
        const char * const text;
 } packet_command_texts[] = {
@@ -579,7 +577,7 @@ const struct {
 
 
 /* From Table 303 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
-const char * const sense_key_texts[16] = {
+static const char * const sense_key_texts[16] = {
        "No sense data",
        "Recovered error",
        "Not ready",
@@ -599,7 +597,7 @@ const char * const sense_key_texts[16] = {
 };
 
 /* From Table 304 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
-const struct {
+static const struct {
        unsigned long asc_ascq;
        const char * const text;
 } sense_data_texts[] = {