# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.573.92.15 -> 1.573.92.16
# drivers/media/video/cpia_usb.c 1.9 -> 1.10
# drivers/media/video/cpia.h 1.3 -> 1.4
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/07 rddunlap@osdl.org 1.573.92.16
# [PATCH] build cpia video driver
#
# This patch enables the cpia driver to build on 2.5.41.
# --------------------------------------------
#
diff -Nru a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h
--- a/drivers/media/video/cpia.h Tue Oct 8 15:53:44 2002
+++ b/drivers/media/video/cpia.h Tue Oct 8 15:53:44 2002
@@ -378,8 +378,8 @@
/* ErrorCode */
#define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */
-#define ALOG(lineno,fmt,args...) printk(fmt,lineno,##args)
-#define LOG(fmt,args...) ALOG((__LINE__),KERN_INFO __FILE__":"__FUNCTION__"(%d):"fmt,##args)
+#define ALOG(fmt,args...) printk(fmt, ##args)
+#define LOG(fmt,args...) ALOG(KERN_INFO __FILE__ ":%s(%d):" fmt, __FUNCTION__, __LINE__, ##args)
#ifdef _CPIA_DEBUG_
#define ADBG(lineno,fmt,args...) printk(fmt, jiffies, lineno, ##args)
diff -Nru a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c
--- a/drivers/media/video/cpia_usb.c Tue Oct 8 15:53:44 2002
+++ b/drivers/media/video/cpia_usb.c Tue Oct 8 15:53:44 2002
@@ -167,7 +167,7 @@
/* resubmit */
urb->dev = ucpia->dev;
if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0)
- printk(KERN_ERR __FUNCTION__ ": usb_submit_urb ret %d\n", i);
+ printk(KERN_ERR "%s: usb_submit_urb ret %d\n", __FUNCTION__, i);
}
static int cpia_usb_open(void *privdata)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Tue Oct 15 2002 - 22:00:29 EST