diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
| commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
| tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /include/media/v4l2-common.h | |
| parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'include/media/v4l2-common.h')
| -rw-r--r-- | include/media/v4l2-common.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index 475d0d8275e0..316a58453134 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h | |||
| @@ -61,8 +61,6 @@ | |||
| 61 | v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \ | 61 | v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \ |
| 62 | } while (0) | 62 | } while (0) |
| 63 | 63 | ||
| 64 | /* Prints the ioctl in a human-readable format */ | ||
| 65 | extern void v4l_printk_ioctl(unsigned int cmd); | ||
| 66 | 64 | ||
| 67 | /* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */ | 65 | /* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */ |
| 68 | #define v4l_print_ioctl(name, cmd) \ | 66 | #define v4l_print_ioctl(name, cmd) \ |