summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/defconfig
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
commit8624512aa908741ba2795200133eae0d7f4557ea (patch)
treed5d3036fccf2604f4c98dedc11e8adb929d6b52e /arch/sparc64/defconfig
parent7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff)
Merge with 2.3.48.
Diffstat (limited to 'arch/sparc64/defconfig')
-rw-r--r--arch/sparc64/defconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 917bb5e74..12e9432a7 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -273,9 +273,9 @@ CONFIG_SUNBMAC=m
CONFIG_SUNQE=m
CONFIG_DE4X5=m
CONFIG_VORTEX=m
-CONFIG_RTL8139=m
+CONFIG_8139TOO=m
CONFIG_NE2K_PCI=m
-CONFIG_EEXPRESS_PRO100=m
+CONFIG_EEPRO100=m
CONFIG_ADAPTEC_STARFIRE=m
#
@@ -299,7 +299,7 @@ CONFIG_VIDEO_DEV=y
# CONFIG_VIDEO_BT848 is not set
#
-# Filesystems
+# File systems
#
# CONFIG_QUOTA is not set
CONFIG_AUTOFS_FS=m