summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/defconfig
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-05-12 23:48:34 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-05-12 23:48:34 +0000
commit7fd36ebeeec9244a7431bb010e6e3c5e4848a0d5 (patch)
tree5fb03a9aafdd1cec5f4f6ff7f1873174cb89b66c /arch/sparc64/defconfig
parentba2dacab305c598cd4c34a604f8e276bf5bab5ff (diff)
Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)
Diffstat (limited to 'arch/sparc64/defconfig')
-rw-r--r--arch/sparc64/defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index f655e7b4a..135ee279e 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -353,6 +353,8 @@ CONFIG_ACENIC=m
# CONFIG_ACENIC_OMIT_TIGON_I is not set
CONFIG_SK98LIN=m
CONFIG_MYRI_SBUS=m
+CONFIG_FDDI=y
+CONFIG_SKFP=m
#
# Unix 98 PTY support