From 7fd36ebeeec9244a7431bb010e6e3c5e4848a0d5 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 12 May 2000 23:48:34 +0000
Subject: Merge with Linux 2.3.99-pre8.  Linus must hate me, too man patches
 ;-)

---
 arch/sparc64/defconfig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'arch/sparc64/defconfig')

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
-- 
cgit v1.2.3