diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-05-22 19:23:39 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-05-22 19:23:39 +0000 |
| commit | c3aa185f55fdc149f5491cd71c1e76b49f56ecd4 (patch) | |
| tree | 628cb2361cc2bf750efb58e3a2a8e86fd57b2f12 /v4l | |
| parent | 2d72b576e164cae31abae406649d52af1e2bd340 (diff) | |
| download | mediapointer-dvb-s2-c3aa185f55fdc149f5491cd71c1e76b49f56ecd4.tar.gz mediapointer-dvb-s2-c3aa185f55fdc149f5491cd71c1e76b49f56ecd4.tar.bz2 | |
Large changes. Mostly merged patches from mm kernel branch and 2.6.12-rc4.
Update entries for Lifiview Platinum FM and Avermedia cards
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 35 | ||||
| -rw-r--r-- | v4l/compat.h | 7 |
2 files changed, 40 insertions, 2 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index fab3fb72e..8c274c932 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,36 @@ +2005-05-23 23:50 nshmyrev + + * saa7134-cards.c, saa7134.h, saa7134-input.c: + + Update entries for Lifeview Platinum FM, Avermedia 307 Studio, + Avermedia 307 and Avermedia GO 007 FM + +2005-05-22 23:40 nshmyrev + + * ir-common.c: + + Update hauppage ir codes + +2005-05-22 23:20 nshmyrev + + * tda9887.c, tuner-core.c: + + Fix module_param_string argument order + +2005-05-22 23:20 nshmyrev + + * bttv-i2c.c, compat.h, cx88-dvb.c, saa6752hs.c: + * saa7134-core.c, saa7134-empress.c: + + Merge changes from 2.6.12 kernel. + +2005-05-22 23:06 nshmyrev + + * scripts/cardlist, doc/CARDLIST.bttv, doc/CARDLIST.cx88: + * doc/CARDLIST.tuner, doc/CARDLIST.saa7134: + + Update cardlist script and list of cards + 2005-04-26 11:01 kraxel * README.patches: @@ -965,7 +998,7 @@ saa7134-reg.h, saa7134-ts.c, saa7134-tvaudio.c, saa7134-vbi.c, saa7134-video.c, saa7134.h, video-buf.c, video-buf.h: - - added a bunch of $Id: ChangeLog,v 1.1 2005/05/22 18:32:31 nsh Exp $ tags. + - added a bunch of $Id: ChangeLog,v 1.2 2005/05/22 19:23:39 nsh Exp $ tags. 2004-09-15 17:35 kraxel diff --git a/v4l/compat.h b/v4l/compat.h index d1fab8474..c88ae1f98 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -20,7 +20,7 @@ #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,6) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) # define __user # define __kernel # define __iomem @@ -33,6 +33,10 @@ # define assert_spin_locked(foobar) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) +#define __le32 __u32 +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7) static inline unsigned long msecs_to_jiffies(const unsigned int m) { @@ -75,6 +79,7 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) return jiffies_to_msecs(timeout); } #endif + /* * Local variables: * c-basic-offset: 8 |