summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:43 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:43 +0000
commit0fc7fdb71a319c3af5cf33cc46f0ebc0c2648e67 (patch)
treef52e09b982ee948a799d5d77b9b611bbd3b58826
parent1c98a4f36feff5bde09283b4d4cc7420ce92d4e6 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_901xf86-4_3_99_16
-rw-r--r--src/v4l.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/v4l.c b/src/v4l.c
index 156d63c..0532ac0 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -2,7 +2,7 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.30 2002/05/14 20:19:53 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.32 2003/09/24 02:43:30 dawes Exp $ */
#include "videodev.h"
#include "xf86.h"
@@ -13,7 +13,7 @@
#include "xf86fbman.h"
#include "xf86xv.h"
#include "Xv.h"
-#include "miscstruct.h"
+#include "regionstr.h"
#include "dgaproc.h"
#include "xf86str.h"
@@ -220,7 +220,7 @@ static int V4lOpenDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn)
if (first) {
first = 0;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
- "v4l: memPhysBase=%p\n", pScrn->memPhysBase);
+ "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
}
switch (pScrn->bitsPerPixel) {