diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /include/asm-ppc/feature.h | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'include/asm-ppc/feature.h')
| -rw-r--r-- | include/asm-ppc/feature.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-ppc/feature.h b/include/asm-ppc/feature.h index 318150dab..78d73b532 100644 --- a/include/asm-ppc/feature.h +++ b/include/asm-ppc/feature.h @@ -32,8 +32,8 @@ enum system_feature { FEATURE_Mediabay_reset, FEATURE_Mediabay_power, FEATURE_Mediabay_PCI_enable, - FEATURE_Mediabay_IDE_enable, /* Also IDE 1 */ - FEATURE_Mediabay_IDE_reset, /* Also IDE 1 */ + FEATURE_IDE1_enable, /* MediaBay IDE */ + FEATURE_IDE1_reset, /* MediaBay IDE */ FEATURE_Mediabay_floppy_enable, FEATURE_BMac_reset, FEATURE_BMac_IO_enable, @@ -43,6 +43,8 @@ enum system_feature { FEATURE_Sound_CLK_enable, FEATURE_IDE2_enable, FEATURE_IDE2_reset, + FEATURE_Mediabay_IDE_switch, /* MB IDE bus switch */ + FEATURE_Mediabay_content, /* MB content indicator enable */ FEATURE_last, }; |