summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:36:36 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2004-02-23 21:36:36 +0000
commit11d740de2078d90c2bd130739c7d68f76492e185 (patch)
tree0b2ee293ccb4dd5561d68a391ab3466a3778801f
parentc538f26ed84ff86fae21775b41861a4c311061e3 (diff)
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
-rw-r--r--src/xf86Aiptek.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index 39b8f9d..6156fea 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -35,7 +35,7 @@
* 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.c,v 1.1 2003/06/25 18:06:25 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.c,v 1.2 2003/12/22 17:48:10 tsi Exp $ */
/*
*
@@ -1681,7 +1681,7 @@ xf86AiptekSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode)
LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate;
AiptekDevicePtr device = (AiptekDevicePtr)(local->private);
- DBG(3, ErrorF("xf86AiptekSwitchMode() dev=0x%02x mode=%d\n", dev, mode));
+ DBG(3, ErrorF("xf86AiptekSwitchMode() dev=%p mode=%d\n", dev, mode));
switch(mode)
{
@@ -1699,7 +1699,7 @@ xf86AiptekSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode)
default:
{
- DBG(1, ErrorF("xf86AiptekSwitchMode dev=0x%02x invalid mode=%d\n",
+ DBG(1, ErrorF("xf86AiptekSwitchMode dev=%p invalid mode=%d\n",
dev, mode));
return BadMatch;
}