From ba2dacab305c598cd4c34a604f8e276bf5bab5ff Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 12 May 2000 21:05:59 +0000 Subject: Merge with Linux 2.3.99-pre7 and various other bits. --- include/asm-ppc/feature.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/asm-ppc/feature.h') 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, }; -- cgit v1.2.3