Some small fixes and cleanups:

o superfluidous #ifdef __KERNEL__ in include/asm-mips/socket.h removed
o we don't need a little endian version of waking_non_zero_interruptible()
o arch/mips/config.in fixes and improvements
o compile floppy/kbd/ide support only when the CONFIG options are set
o IP22s aren't the only MIPS boxes without a PC speaker

3 files changed, 43 insertions, 16 deletions

diff --git a/arch/mips/config.in b/arch/mips/config.in
index 9e6e664d2..e5b6e362d 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -31,6 +31,8 @@ unset CONFIG_PCI
 unset CONFIG_ISA
 unset CONFIG_MIPS_JAZZ
 unset CONFIG_VIDEO_G364
+unset CONFIG_HAVE_IO_PORTS
+unset CONFIG_PC_KEYB
 
 define_bool CONFIG_SBUS n
 
@@ -44,18 +46,22 @@ if [ "$CONFIG_MIPS_MAGNUM_4000" = "y" -o \
    define_bool CONFIG_FB y
    define_bool CONFIG_FB_G364 y	
    define_bool CONFIG_MIPS_JAZZ y
+   define_bool CONFIG_PC_KEYB y
 fi
 if [ "$CONFIG_ACER_PICA_61" = "y" ]; then
    define_bool CONFIG_ARC32 y
    define_bool CONFIG_HAVE_IO_PORTS y
    define_bool CONFIG_MIPS_JAZZ y
+   define_bool CONFIG_PC_KEYB y
 fi
 if [ "$CONFIG_SGI_IP22" = "y" ]; then
    define_bool CONFIG_ARC32 y
+   define_bool CONFIG_PC_KEYB y
 fi
 if [ "$CONFIG_SNI_RM200_PCI" = "y" ]; then
    define_bool CONFIG_ARC32 y
    define_bool CONFIG_HAVE_IO_PORTS y
+   define_bool CONFIG_PC_KEYB y
 fi
 if [ "$CONFIG_DDB5074" = "y" ]; then
    define_bool CONFIG_HAVE_IO_PORTS y
@@ -85,7 +91,7 @@ mainmenu_option next_comment
 		 R8000 CONFIG_CPU_R8000	\
 		 R10000 CONFIG_CPU_R10000" R4x00
 
-	bool 'Advanced CPU Config' CONFIG_CPU_ADVANCED
+	bool 'Override CPU Options' CONFIG_CPU_ADVANCED
 
 	if [ "$CONFIG_CPU_ADVANCED" = "y" ]; then
 		bool '  ll/sc Instructions available' CONFIG_CPU_HAS_LLSC
@@ -149,6 +155,9 @@ comment 'General setup'
 
 	if [ "$CONFIG_DECSTATION" = "y" ]; then
             bool 'TURBOchannel support' CONFIG_TC
+#           if [ "$CONFIG_TC" = "y" ]; then
+#              bool ' Access.Bus support' CONFIG_ACCESSBUS
+#           fi
 	fi
 endmenu
 
@@ -168,13 +177,13 @@ if [ "$CONFIG_NET" = "y" ]; then
    source net/Config.in
 fi
 
-if [ "$CONFIG_DECSTATION" != "n" -a \
-     "$CONFIG_SGI_IP22" != "n" ]; then
+if [ "$CONFIG_DECSTATION" != "y" -a \
+     "$CONFIG_SGI_IP22" != "y" ]; then
     source drivers/telephony/Config.in
 fi
 
-if [ "$CONFIG_SGI_IP22" != "n" -a \
-     "$CONFIG_DECSTATION" != "n" ]; then
+if [ "$CONFIG_SGI_IP22" != "y" -a \
+     "$CONFIG_DECSTATION" != "y" ]; then
 
     mainmenu_option next_comment
     comment 'ATA/IDE/MFM/RLL support'
@@ -200,8 +209,8 @@ if [ "$CONFIG_SCSI" != "n" ]; then
 fi
 endmenu
 
-if [ "$CONFIG_DECSTATION" != "n" -a \
-     "$CONFIG_SGI_IP22" != "n" ]; then
+if [ "$CONFIG_DECSTATION" != "y" -a \
+     "$CONFIG_SGI_IP22" != "y" ]; then
     source drivers/i2o/Config.in
 fi
 
@@ -268,8 +277,8 @@ if [ "$CONFIG_ISA" = "y" -o "$CONFIG_PCI" = "y" ]; then
    endmenu
 fi
 
-if [ "$CONFIG_DECSTATION" != "n" -a \
-     "$CONFIG_SGI_IP22" != "n" ]; then
+if [ "$CONFIG_DECSTATION" != "y" -a \
+     "$CONFIG_SGI_IP22" != "y" ]; then
    source drivers/char/Config.in
 fi
 
@@ -293,8 +302,9 @@ if [ "$CONFIG_DECSTATION" = "y" ]; then
    if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
       int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
    fi
-   bool 'Keyboard Support' CONFIG_KEYBOARD
-   bool 'Mouse Support' CONFIG_MOUSE
+#   if [ "$CONFIG_ACCESSBUS" = "y" ]; then
+#      bool 'MAXINE Access.Bus mouse (VSXXX-BB/GB) support' CONFIG_DTOP_MOUSE
+#   fi
    bool 'Enhanced Real Time Clock Support' CONFIG_RTC
    endmenu
 fi
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index fa44ffabf..a2c325fd6 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -84,8 +84,10 @@ struct ide_ops *ide_ops;
 extern struct rtc_ops no_rtc_ops;
 struct rtc_ops *rtc_ops;
 
+#ifdef CONFIG_PC_KEYB
 extern struct kbd_ops no_kbd_ops;
 struct kbd_ops *kbd_ops;
+#endif
 
 /*
  * Setup information
@@ -272,8 +274,11 @@ void __init setup_arch(char **cmdline_p)
 	ide_ops = &no_ide_ops;
 #endif
 
-	rtc_ops = &no_rtc_ops;
+#ifdef CONFIG_PC_KEYB
 	kbd_ops = &no_kbd_ops;
+#endif
+	
+	rtc_ops = &no_rtc_ops;
 
 	switch(mips_machgroup)
 	{
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 604847280..96d534a75 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -9,10 +9,10 @@
 	$(CC) $(CFLAGS) -c $< -o $*.o
 
 L_TARGET = lib.a
-L_OBJS	= csum_partial.o csum_partial_copy.o floppy-std.o \
-	  floppy-no.o ide-std.o ide-no.o kbd-std.o kbd-no.o rtc-std.o \
-	  rtc-no.o memcpy.o memset.o strlen_user.o strncpy_user.o \
-	  strnlen_user.o watch.o
+
+L_OBJS	= csum_partial.o csum_partial_copy.o \
+          rtc-std.o rtc-no.o memcpy.o memset.o  watch.o\
+          strlen_user.o strncpy_user.o strnlen_user.o
 
 ifdef CONFIG_CPU_R3000
   L_OBJS += r3k_dump_tlb.o 
@@ -20,4 +20,16 @@ else
   L_OBJS += dump_tlb.o 
 endif
 
+ifdef CONFIG_BLK_DEV_FD
+  L_OBJS += flopyy-no.o flopyy-std.o
+endif
+
+ifdef CONFIG_IDE
+  L_OBJS += ide-std.o ide-no.o
+endif
+
+ifdef CONFIG_PC_KEYB
+  L_OBJS += kbd-std.o kbd-no.o
+endif
+
 include $(TOPDIR)/Rules.make