diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
tree | 954a648692e7da983db1d2470953705f6a729264 /arch/mips/defconfig-malta | |
parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'arch/mips/defconfig-malta')
-rw-r--r-- | arch/mips/defconfig-malta | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/defconfig-malta b/arch/mips/defconfig-malta index 7f83eba55..6ec01a474 100644 --- a/arch/mips/defconfig-malta +++ b/arch/mips/defconfig-malta @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit # +CONFIG_ALPHA=y # # Code maturity level options @@ -178,6 +179,7 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SD_EXTRA_DEVS=40 # CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set @@ -436,6 +438,7 @@ CONFIG_LOCKD=y # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_SMB_NLS is not set # CONFIG_NLS is not set # |