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

1 files changed, 16 insertions, 4 deletions

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