diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-06-09 11:55:06 +0200 |
---|---|---|
committer | Jean-Francois Moine <moinejf@free.fr> | 2008-06-09 11:55:06 +0200 |
commit | a76f49b7ffe277c032fab5226bc092da0b324799 (patch) | |
tree | 47dcbd1db7c6c3f9493092a643c9ee5cfb578def /linux/drivers/media/video/cpia.h | |
parent | 80fb482585b549df0669ef539d101369fae7a40a (diff) | |
parent | 18e4796addabb3886c9346e035ee30bb96bbcd74 (diff) | |
download | mediapointer-dvb-s2-a76f49b7ffe277c032fab5226bc092da0b324799.tar.gz mediapointer-dvb-s2-a76f49b7ffe277c032fab5226bc092da0b324799.tar.bz2 |
From: Jean-Francois Moine <moinejf@free.fr>
Update from main repository.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux/drivers/media/video/cpia.h')
-rw-r--r-- | linux/drivers/media/video/cpia.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cpia.h b/linux/drivers/media/video/cpia.h index 107234853..d579b5edb 100644 --- a/linux/drivers/media/video/cpia.h +++ b/linux/drivers/media/video/cpia.h @@ -423,11 +423,11 @@ void cpia_unregister_camera(struct cam_data *cam); /* ErrorCode */ #define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */ #define ALOG(fmt,args...) printk(fmt, ##args) -#define LOG(fmt,args...) ALOG(KERN_INFO __FILE__ ":%s(%d):" fmt, __FUNCTION__ , __LINE__ , ##args) +#define LOG(fmt,args...) ALOG(KERN_INFO __FILE__ ":%s(%d):" fmt, __func__ , __LINE__ , ##args) #ifdef _CPIA_DEBUG_ #define ADBG(fmt,args...) printk(fmt, jiffies, ##args) -#define DBG(fmt,args...) ADBG(KERN_DEBUG __FILE__" (%ld):%s(%d):" fmt, __FUNCTION__, __LINE__ , ##args) +#define DBG(fmt,args...) ADBG(KERN_DEBUG __FILE__" (%ld):%s(%d):" fmt, __func__, __LINE__ , ##args) #else #define DBG(fmn,args...) do {} while(0) #endif |