From 1a1d77dd589de5a567fa95e36aa6999c704ceca4 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 28 Aug 2000 22:00:09 +0000
Subject: Merge with 2.4.0-test7.

---
 arch/mips/defconfig-orion | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'arch/mips/defconfig-orion')

diff --git a/arch/mips/defconfig-orion b/arch/mips/defconfig-orion
index 9828de133..d0315924d 100644
--- a/arch/mips/defconfig-orion
+++ b/arch/mips/defconfig-orion
@@ -181,6 +181,10 @@ CONFIG_BLK_DEV_INITRD=y
 # Joysticks
 #
 # CONFIG_JOYSTICK is not set
+
+#
+# Input core support is needed for joysticks
+#
 # CONFIG_QIC02_TAPE is not set
 
 #
@@ -190,11 +194,6 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_INTEL_RNG is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
-
-#
-# Video For Linux
-#
-# CONFIG_VIDEO_DEV is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -206,6 +205,11 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_AGP is not set
 # CONFIG_DRM is not set
 
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
 #
 # File systems
 #
@@ -278,6 +282,11 @@ CONFIG_MSDOS_PARTITION=y
 #
 # CONFIG_USB is not set
 
+#
+# Input core support
+#
+# CONFIG_INPUT is not set
+
 #
 # Kernel hacking
 #
-- 
cgit v1.2.3