>>>>> On Tue, 10 Jun 2003 13:43:09 +0100, ralf@linux-mips.org said: ralf> Removed files: ralf> arch/mips/lib : kbd-no.c kbd-std.c ralf> arch/mips64/lib: kbd-no.c kbd-std.c ralf> Log message: ralf> Delete unused source files. If we implement kbd_controller_present() macro, kbd-no.c is not needed in 2.4 kernel too. Here is a patch. I posted same patch three month ago but new one includes mips64 changes. diff -ur linux-mips-cvs/arch/mips/kernel/setup.c linux.new/arch/mips/kernel/setup.c --- linux-mips-cvs/arch/mips/kernel/setup.c Thu May 8 10:28:23 2003 +++ linux.new/arch/mips/kernel/setup.c Wed Jun 11 09:46:59 2003 @@ -68,7 +68,6 @@ struct rtc_ops *rtc_ops; #ifdef CONFIG_PC_KEYB -extern struct kbd_ops no_kbd_ops; struct kbd_ops *kbd_ops; #endif @@ -505,10 +504,6 @@ ide_ops = &no_ide_ops; #endif -#ifdef CONFIG_PC_KEYB - kbd_ops = &no_kbd_ops; -#endif - rtc_ops = &no_rtc_ops; switch(mips_machgroup) diff -ur linux-mips-cvs/arch/mips/lib/Makefile linux.new/arch/mips/lib/Makefile --- linux-mips-cvs/arch/mips/lib/Makefile Fri Feb 14 09:41:21 2003 +++ linux.new/arch/mips/lib/Makefile Wed Jun 11 09:47:35 2003 @@ -19,6 +19,6 @@ obj-$(CONFIG_BLK_DEV_FD) += floppy-no.o floppy-std.o obj-$(subst m,y,$(CONFIG_IDE)) += ide-std.o ide-no.o # needed for ide module -obj-$(CONFIG_PC_KEYB) += kbd-std.o kbd-no.o +obj-$(CONFIG_PC_KEYB) += kbd-std.o include $(TOPDIR)/Rules.make diff -ur linux-mips-cvs/arch/mips64/kernel/setup.c linux.new/arch/mips64/kernel/setup.c --- linux-mips-cvs/arch/mips64/kernel/setup.c Thu May 8 10:28:23 2003 +++ linux.new/arch/mips64/kernel/setup.c Wed Jun 11 09:46:23 2003 @@ -68,7 +68,6 @@ extern struct rtc_ops no_rtc_ops; struct rtc_ops *rtc_ops; -extern struct kbd_ops no_kbd_ops; struct kbd_ops *kbd_ops; /* diff -ur linux-mips-cvs/arch/mips64/lib/Makefile linux.new/arch/mips64/lib/Makefile --- linux-mips-cvs/arch/mips64/lib/Makefile Fri Feb 14 09:41:26 2003 +++ linux.new/arch/mips64/lib/Makefile Wed Jun 11 09:48:17 2003 @@ -12,6 +12,6 @@ obj-$(CONFIG_BLK_DEV_FD) += floppy-no.o floppy-std.o obj-$(subst m,y,$(CONFIG_IDE)) += ide-std.o ide-no.o # needed for ide module -obj-$(CONFIG_PC_KEYB) += kbd-std.o kbd-no.o +obj-$(CONFIG_PC_KEYB) += kbd-std.o include $(TOPDIR)/Rules.make diff -ur linux-mips-cvs/include/asm-mips/keyboard.h linux.new/include/asm-mips/keyboard.h --- linux-mips-cvs/include/asm-mips/keyboard.h Fri Jan 4 07:54:52 2002 +++ linux.new/include/asm-mips/keyboard.h Wed Jun 11 09:43:13 2003 @@ -62,6 +62,7 @@ }; extern struct kbd_ops *kbd_ops; +#define kbd_controller_present() (kbd_ops != 0) /* Do the actual calls via kbd_ops vector */ #define kbd_request_region() kbd_ops->kbd_request_region() diff -ur linux-mips-cvs/include/asm-mips64/keyboard.h linux.new/include/asm-mips64/keyboard.h --- linux-mips-cvs/include/asm-mips64/keyboard.h Fri Jan 4 07:54:52 2002 +++ linux.new/include/asm-mips64/keyboard.h Wed Jun 11 09:43:29 2003 @@ -62,6 +62,7 @@ }; extern struct kbd_ops *kbd_ops; +#define kbd_controller_present() (kbd_ops != 0) /* Do the actual calls via kbd_ops vector */ #define kbd_request_region() kbd_ops->kbd_request_region() --- Atsushi Nemoto
