diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
tree | e9ce4bc598d06374bda906f18365984bf22a526a /arch/mips/defconfig | |
parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'arch/mips/defconfig')
-rw-r--r-- | arch/mips/defconfig | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index b1892eba6..ae3ba1f9d 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -33,12 +33,13 @@ CONFIG_CPU_R4X00=y # CONFIG_ELF_KERNEL=y CONFIG_CPU_LITTLE_ENDIAN=y -CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set CONFIG_NET=y CONFIG_SYSVIPC=y CONFIG_SYSCTL=y -# CONFIG_PARPORT is not set +# CONFIG_PNP_PARPORT is not set # # Loadable module support @@ -121,6 +122,7 @@ CONFIG_MIPS_JAZZ_SONIC=y # CONFIG_NET_VENDOR_3COM is not set # CONFIG_LANCE is not set # CONFIG_NET_VENDOR_SMC is not set +# CONFIG_NET_VENDOR_RACAL is not set # CONFIG_NET_ISA is not set CONFIG_NET_EISA=y CONFIG_PCNET32=y @@ -133,7 +135,6 @@ CONFIG_PCNET32=y # CONFIG_NET_POCKET is not set # CONFIG_FDDI is not set # CONFIG_DLCI is not set -# CONFIG_PLIP is not set # CONFIG_PPP is not set # CONFIG_NET_RADIO is not set # CONFIG_SLIP is not set @@ -177,6 +178,7 @@ CONFIG_ISO9660_FS=y # CONFIG_ROMFS_FS is not set # CONFIG_AUTOFS_FS is not set # CONFIG_UFS_FS is not set +# CONFIG_MAC_PARTITION is not set # # Character devices @@ -192,6 +194,7 @@ CONFIG_SERIAL=y # CONFIG_APM is not set # CONFIG_WATCHDOG is not set # CONFIG_RTC is not set +# CONFIG_NVRAM is not set # CONFIG_JOYSTICK is not set # @@ -202,5 +205,6 @@ CONFIG_SERIAL=y # # Kernel hacking # +# CONFIG_CROSSCOMPILE is not set # CONFIG_REMOTE_DEBUG is not set # CONFIG_PROFILE is not set |