diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-10-11 20:04:27 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-10-11 20:04:27 +0000 |
| commit | 72df048713f9c8f3d39b06e3c8f6d571cc01e38e (patch) | |
| tree | b970962be2a639580df391cd14b916d2e58258fd | |
| parent | a69b5bdf10ab44bf81a7fcd61d963468712b7493 (diff) | |
| download | mediapointer-dvb-s2-72df048713f9c8f3d39b06e3c8f6d571cc01e38e.tar.gz mediapointer-dvb-s2-72df048713f9c8f3d39b06e3c8f6d571cc01e38e.tar.bz2 | |
* v4l/compat.h:
- Fix compilation with 2.6.8.
Signed-off-by: Nickolay V. Shmyrev <<nshmyrev@yandex.ru>>
| -rw-r--r-- | v4l/ChangeLog | 7 | ||||
| -rw-r--r-- | v4l/compat.h | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 04f834043..4ec482898 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-10-11 20:03 nshmyrev + + * v4l/compat.h: + - Fix compilation with 2.6.8. + + Signed-off-by: Nickolay V. Shmyrev <<nshmyrev@yandex.ru>> + 2005-10-11 17:59 mkrufky * ../linux/drivers/media/video/bttv-cards.c: (bttv_idcard): diff --git a/v4l/compat.h b/v4l/compat.h index 8eafceb96..2271e6524 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.23 2005/10/11 02:52:03 mrechberger Exp $ + * $Id: compat.h,v 1.24 2005/10/11 20:04:27 nsh Exp $ */ #ifndef _COMPAT_H @@ -110,8 +110,9 @@ static inline void msleep(unsigned int msecs) timeout = schedule_timeout(timeout); } } +#endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) static inline unsigned long msleep_interruptible(unsigned int msecs) { unsigned long timeout = msecs_to_jiffies(msecs); @@ -123,7 +124,7 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) return jiffies_to_msecs(timeout); } #endif -#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) #define pm_message_t u32 #endif @@ -151,7 +152,9 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) #define KEY_SLOW 0x199 #define KEY_OK 0x160 #define KEY_DIGITS 0x19d +#endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #define container_of(ptr, type, member) ({ \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) |