diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-18 23:31:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-18 23:31:08 +0000 |
| commit | e8f9b6396e79654ea5932f64131cafbe8caadfb1 (patch) | |
| tree | 90cf8b3a2475a774369eda22247cab7874fd7bbf /arch/i386 | |
| parent | d4c419dfaa853f5db107973976d4215ae648e976 (diff) | |
Merge with Linux 2.4.0-test5-pre2.
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 507ea5469..b99d0cec3 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig @@ -76,8 +76,6 @@ CONFIG_HOTPLUG=y # CONFIG_PCMCIA=y CONFIG_CARDBUS=y -# CONFIG_I82365 is not set -CONFIG_TCIC=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y |