summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-12-20 00:28:30 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-12-20 00:28:30 +0000
commitc538f26ed84ff86fae21775b41861a4c311061e3 (patch)
tree09a17b98c90209dbd1241a9f7b1d4c40ac4f4d5a
parent4b1ef06b77c87bb5bd943a607130e556042bd61c (diff)
merge XFree86 RC2 (4.3.99.902) from vendor branchXEVIE-BASE
-rw-r--r--src/xf86Aiptek.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h
index 2ed4751..d6ce76d 100644
--- a/src/xf86Aiptek.h
+++ b/src/xf86Aiptek.h
@@ -34,7 +34,8 @@
* TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.2 2003/11/03 05:36:32 tsi Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.3 2003/12/10 01:50:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.3 2003/12/10 01:50:33 dawes Exp $ */
#ifndef _AIPTEK_H_
#define _AIPTEK_H_
@@ -43,6 +44,9 @@
#ifdef LINUX_INPUT
# include <asm/types.h>
# include <linux/input.h>
+# ifndef EV_MSC
+# define EV_MSC 0x04
+# endif
/* keithp - a hack to avoid redefinitions of these in xf86str.h */
# ifdef BUS_PCI
# undef BUS_PCI