From: James S. <jsi...@us...> - 2002-05-25 20:32:06
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick In directory usw-pr-cvs1:/tmp/cvs-serv32077/linux/drivers/input/joystick Modified Files: Makefile analog.c Log Message: Synced to 2.5.18 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 10 Feb 2002 23:13:57 -0000 1.5 +++ Makefile 25 May 2002 20:32:03 -0000 1.6 @@ -2,10 +2,6 @@ # Makefile for the input core drivers. # -# The target object and module list name. - -O_TARGET := joydrv.o - mod-subdirs := iforce # Each configuration option enables a list of files. @@ -33,7 +29,7 @@ obj-$(CONFIG_JOYSTICK_TWIDJOY) += twidjoy.o obj-$(CONFIG_JOYSTICK_WARRIOR) += warrior.o -subdir-$(CONFIG_JOYSTICK_IFORCE) += iforce +obj-$(CONFIG_JOYSTICK_IFORCE) += iforce/ # The global Rules.make. Index: analog.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/analog.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- analog.c 22 Jan 2002 20:18:32 -0000 1.68 +++ analog.c 25 May 2002 20:32:03 -0000 1.69 @@ -137,10 +137,9 @@ */ #ifdef __i386__ -#define TSC_PRESENT (test_bit(X86_FEATURE_TSC, &boot_cpu_data.x86_capability)) -#define GET_TIME(x) do { if (TSC_PRESENT) rdtscl(x); else x = get_time_pit(); } while (0) -#define DELTA(x,y) (TSC_PRESENT?((y)-(x)):((x)-(y)+((x)<(y)?1193180L/HZ:0))) -#define TIME_NAME (TSC_PRESENT?"TSC":"PIT") +#define GET_TIME(x) do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0) +#define DELTA(x,y) (cpu_has_tsc?((y)-(x)):((x)-(y)+((x)<(y)?1193180L/HZ:0))) +#define TIME_NAME (cpu_has_tsc?"TSC":"PIT") static unsigned int get_time_pit(void) { extern spinlock_t i8253_lock; |