diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
| commit | 7fd36ebeeec9244a7431bb010e6e3c5e4848a0d5 (patch) | |
| tree | 5fb03a9aafdd1cec5f4f6ff7f1873174cb89b66c /arch/mips | |
| parent | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (diff) | |
Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/defconfig | 3 | ||||
| -rw-r--r-- | arch/mips/defconfig-decstation | 3 | ||||
| -rw-r--r-- | arch/mips/defconfig-ip22 | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index eee317462..d4451245a 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -81,7 +81,8 @@ CONFIG_KMOD=y # CONFIG_BLK_DEV_LVM is not set # CONFIG_BLK_DEV_MD is not set # CONFIG_MD_LINEAR is not set -# CONFIG_MD_STRIPED is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_RAID15_DANGEROUS is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_INITRD is not set diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation index 0edab148e..add67fef1 100644 --- a/arch/mips/defconfig-decstation +++ b/arch/mips/defconfig-decstation @@ -79,7 +79,8 @@ CONFIG_TC=y # CONFIG_BLK_DEV_LVM is not set # CONFIG_BLK_DEV_MD is not set # CONFIG_MD_LINEAR is not set -# CONFIG_MD_STRIPED is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_RAID15_DANGEROUS is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_INITRD is not set diff --git a/arch/mips/defconfig-ip22 b/arch/mips/defconfig-ip22 index eee317462..d4451245a 100644 --- a/arch/mips/defconfig-ip22 +++ b/arch/mips/defconfig-ip22 @@ -81,7 +81,8 @@ CONFIG_KMOD=y # CONFIG_BLK_DEV_LVM is not set # CONFIG_BLK_DEV_MD is not set # CONFIG_MD_LINEAR is not set -# CONFIG_MD_STRIPED is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_RAID15_DANGEROUS is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_INITRD is not set |