diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-05 10:20:56 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-05 10:20:56 -0300 |
| commit | 5f2d82cefe0ce930f3146875c88b993695c7e03a (patch) | |
| tree | 2d33fe6b5949e509d85f48f5c8331adcb22151d3 /v4l/compat.h | |
| parent | ad789ba2904603896206a72f0445e8ba56da7134 (diff) | |
| parent | 2257e70baa578d959dc4bdcce498ef07d2af00da (diff) | |
| download | mediapointer-dvb-s2-5f2d82cefe0ce930f3146875c88b993695c7e03a.tar.gz mediapointer-dvb-s2-5f2d82cefe0ce930f3146875c88b993695c7e03a.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Fixed a trivial conflict between a janitor's patch from Hans Verkuil and
Andy patch series.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l/compat.h')
| -rw-r--r-- | v4l/compat.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index 6df2f6f13..6e90c0e63 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -230,6 +230,11 @@ static inline int list_is_singular(const struct list_head *head) { return !list_empty(head) && (head->next == head->prev); } + +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) +#define current_uid() (current->uid) #endif #endif |