summaryrefslogtreecommitdiff
path: root/v4l/compat.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-06-29 07:19:06 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-29 07:19:06 -0300
commit8178f50745e3f58d2de7196874a86077e51e2d0a (patch)
treeb33ea445532b46c0153289b134661c6ca5adc98c /v4l/compat.h
parent94e2f24ecce195fb81e8da1e809e3537f58dce6a (diff)
parent1aaedcfcedc4290350ffe058a6f1e7af9319ff3c (diff)
downloadmediapointer-dvb-s2-8178f50745e3f58d2de7196874a86077e51e2d0a.tar.gz
mediapointer-dvb-s2-8178f50745e3f58d2de7196874a86077e51e2d0a.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/cxusb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l/compat.h')
-rw-r--r--v4l/compat.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/v4l/compat.h b/v4l/compat.h
index b49572b4e..88afe3d83 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -541,6 +541,10 @@ do { \
le32_to_cpu(get_unaligned((u32 *)(a)))
#define put_unaligned_le32(r, a) \
put_unaligned(cpu_to_le32(r), ((u32 *)(a)))
+#define get_unaligned_le64(a) \
+ le64_to_cpu(get_unaligned((u64 *)(a)))
+#define put_unaligned_le64(r, a) \
+ put_unaligned(cpu_to_le64(r), ((u64 *)(a)))
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)
#ifdef CONFIG_PROC_FS
@@ -588,6 +592,8 @@ static inline struct proc_dir_entry *proc_create_data(const char *a,
( h ), \
( x ) ) )
+#define dev_name(dev) ((dev)->bus_id)
+
#endif
#endif