Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[pandora-kernel.git] / drivers / media / video / pvrusb2 / pvrusb2-i2c-cmd-v4l2.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index 8a9933d..05ea17a 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
@@ -31,7 +31,7 @@ static void set_standard(struct pvr2_hdw *hdw)
        v4l2_std_id vs;
        vs = hdw->std_mask_cur;
        pvr2_trace(PVR2_TRACE_CHIPS,
-                  "i2c v4l2 set_standard(0x%llx)",(__u64)vs);
+                  "i2c v4l2 set_standard(0x%llx)",(long long unsigned)vs);
 
        pvr2_i2c_core_cmd(hdw,VIDIOC_S_STD,&vs);
 }