summaryrefslogtreecommitdiff
path: root/linux/include/media/v4l2-common.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/include/media/v4l2-common.h')
-rw-r--r--linux/include/media/v4l2-common.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h
index 7bfc609e1..d7ee8f2f9 100644
--- a/linux/include/media/v4l2-common.h
+++ b/linux/include/media/v4l2-common.h
@@ -34,9 +34,15 @@
#define v4l_printk(level, name, adapter, addr, fmt, arg...) \
printk(level "%s %d-%04x: " fmt, name, i2c_adapter_id(adapter), addr , ## arg)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
#define v4l_client_printk(level, client, fmt, arg...) \
v4l_printk(level, (client)->driver->name, (client)->adapter, \
(client)->addr, fmt , ## arg)
+#else
+#define v4l_client_printk(level, client, fmt, arg...) \
+ v4l_printk(level, (client)->driver->driver.name, (client)->adapter, \
+ (client)->addr, fmt , ## arg)
+#endif
#define v4l_err(client, fmt, arg...) \
v4l_client_printk(KERN_ERR, client, fmt , ## arg)