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/i386/defconfig | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'arch/i386/defconfig')
| -rw-r--r-- | arch/i386/defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index e3e50886c..93f300de7 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig @@ -20,6 +20,8 @@ CONFIG_MODULES=y # CONFIG_MATH_EMULATION is not set CONFIG_NET=y CONFIG_PCI=y +CONFIG_PCI_BIOS=y +# CONFIG_PCI_DIRECT is not set # CONFIG_MCA is not set CONFIG_SYSVIPC=y CONFIG_SYSCTL=y @@ -139,7 +141,6 @@ CONFIG_SCSI_OMIT_FLASHPOINT=y # CONFIG_SCSI_NCR53C406A is not set # CONFIG_SCSI_NCR53C7xx is not set # CONFIG_SCSI_NCR53C8XX is not set -# CONFIG_SCSI_PPA is not set # CONFIG_SCSI_PAS16 is not set # CONFIG_SCSI_QLOGIC_FAS is not set # CONFIG_SCSI_QLOGIC_ISP is not set @@ -160,6 +161,7 @@ CONFIG_NET_ETHERNET=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 is not set @@ -172,7 +174,6 @@ CONFIG_EEXPRESS_PRO100=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 @@ -214,6 +215,7 @@ CONFIG_ISO9660_FS=y # CONFIG_ROMFS_FS is not set CONFIG_AUTOFS_FS=y # CONFIG_UFS_FS is not set +# CONFIG_MAC_PARTITION is not set # # Character devices |