Annotation of /trunk/xorg-old/patches-6.8.2-r10/5901_all_4.2.99.3-acecad-debug.patch
Parent Directory | Revision Log
Revision 167 -
(hide annotations)
(download)
Tue May 8 20:58:51 2007 UTC (17 years, 4 months ago) by niro
File size: 1188 byte(s)
Tue May 8 20:58:51 2007 UTC (17 years, 4 months ago) by niro
File size: 1188 byte(s)
-import
1 | niro | 167 | --- XFree86-4.3/xc/programs/Xserver/hw/xfree86/input/acecad/acecad.c~ 2003-02-23 10:22:04.000000000 +0100 |
2 | +++ XFree86-4.3/xc/programs/Xserver/hw/xfree86/input/acecad/acecad.c 2003-02-23 10:22:04.000000000 +0100 | ||
3 | @@ -33,7 +33,6 @@ | ||
4 | * Standard Headers | ||
5 | ****************************************************************************/ | ||
6 | |||
7 | -#ifdef LINUX_INPUT | ||
8 | #include <asm/types.h> | ||
9 | #include <linux/input.h> | ||
10 | #ifdef BUS_PCI | ||
11 | @@ -42,7 +41,6 @@ | ||
12 | #ifdef BUS_ISA | ||
13 | #undef BUS_ISA | ||
14 | #endif | ||
15 | -#endif | ||
16 | |||
17 | #include <misc.h> | ||
18 | #include <xf86.h> | ||
19 | --- XFree86-4.3/xc/programs/Xserver/hw/xfree86/input/confdrv.sh.debug 1999-06-12 17:37:09.000000000 +0200 | ||
20 | +++ XFree86-4.3/xc/programs/Xserver/hw/xfree86/input/confdrv.sh 2003-02-23 20:52:30.000000000 +0100 | ||
21 | @@ -23,9 +23,13 @@ | ||
22 | Args="$BUILTIN `echo $* | tr '[a-z]' '[A-Z]'`" | ||
23 | set - $Args | ||
24 | while [ $# -gt 1 ]; do | ||
25 | + if [ $1 != "ACECAD" ]; then | ||
26 | echo "#undef $1" >> $DRVCONF | ||
27 | echo " $1," >> $DRVCONF | ||
28 | shift | ||
29 | + else | ||
30 | + shift | ||
31 | + fi | ||
32 | done | ||
33 | echo "#undef $1" >> $DRVCONF | ||
34 | echo " $1;" >> $DRVCONF | ||
35 | @@ -35,7 +39,9 @@ | ||
36 | { | ||
37 | EOF | ||
38 | for i in $Args; do | ||
39 | - echo " &$i," >> $DRVCONF | ||
40 | + if [ $i != "ACECAD" ]; then | ||
41 | + echo " &$i," >> $DRVCONF | ||
42 | + fi | ||
43 | done | ||
44 | cat >> $DRVCONF <<EOF | ||
45 | }; |