diff options
| author | Michael Krufky <devnull@localhost> | 2005-11-27 23:27:25 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-11-27 23:27:25 +0000 |
| commit | 994a1d8ac168e4e1720fcae106bb2eb8b9047824 (patch) | |
| tree | 1b5106ee500f8c2d41454985a242819ebf5d860a | |
| parent | 7d003480a0faf4e7018fa8a87104ba17b6db6bb1 (diff) | |
| download | mediapointer-dvb-s2-994a1d8ac168e4e1720fcae106bb2eb8b9047824.tar.gz mediapointer-dvb-s2-994a1d8ac168e4e1720fcae106bb2eb8b9047824.tar.bz2 | |
Revert previous two patches.
Dmitry's upstream patch is broken in v4l-dvb cvs... Reverting for now.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-input.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 17 |
2 files changed, 1 insertions, 22 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c index 391609170..fbb3d24b4 100644 --- a/linux/drivers/media/video/saa7134/saa7134-input.c +++ b/linux/drivers/media/video/saa7134/saa7134-input.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-input.c,v 1.43 2005/11/27 23:14:40 mkrufky Exp $ + * $Id: saa7134-input.c,v 1.44 2005/11/27 23:27:25 mkrufky Exp $ * * handle saa7134 IR remotes via linux kernel input layer. * @@ -722,10 +722,6 @@ int saa7134_input_init1(struct saa7134_dev *dev) return -ENOMEM; memset(ir,0,sizeof(*ir)); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) - ir->dev = input_dev; -#endif - /* init hardware-specific stuff */ ir->mask_keycode = mask_keycode; ir->mask_keydown = mask_keydown; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 1c650634b..f6568060d 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,20 +1,3 @@ -2005-11-27 23:13 mkrufky - - * ../linux/drivers/media/video/saa7134/saa7134-input.c: - (saa7134_input_init1): - - fix build against kernels < 2.6.15 - - Signed-off-by: Michael Krufky <mkrufky@m1k.net> - -2005-11-27 22:24 mkrufky - - * ../linux/drivers/media/video/saa7134/saa7134-input.c: - (saa7134_input_init1): - - Fix an OOPS when initializing IR remote on saa7134 - - Signed-off-by: Dmitry Torokhov <dtor@mail.ru> - Signed-off-by: Michael Krufky <mkrufky@m1k.net> - 2005-11-27 17:34 mkrufky * ../v4l/Makefile: |