diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 39 | ||||
| -rw-r--r-- | v4l/compat.h | 7 |
2 files changed, 45 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 2a984d83f..c0a2affcf 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,42 @@ +2005-12-04 01:04 rmcc + + * ../linux/drivers/media/common/ir-common.c: (ir_input_init): + * ../linux/drivers/media/dvb/cinergyT2/cinergyT2.c: + (cinergyt2_query_rc), (cinergyt2_register_rc), + (cinergyt2_unregister_rc), (cinergyt2_suspend_rc), + (cinergyt2_resume_rc), (cinergyt2_probe), (cinergyt2_disconnect): + * ../linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c: + (dvb_usb_read_remote_control), (dvb_usb_remote_init), + (dvb_usb_remote_exit): + * ../linux/drivers/media/dvb/dvb-usb/dvb-usb.h: + * ../linux/drivers/media/dvb/ttpci/av7110_ir.c: + (av7110_emit_keyup), (av7110_emit_key), (input_register_keys), + (av7110_ir_init), (av7110_ir_exit): + * ../linux/drivers/media/dvb/ttpci/budget-ci.c: + (msp430_ir_interrupt), (msp430_ir_init), (msp430_ir_deinit): + * ../linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c: + (ttusb_dec_handle_irq), (ttusb_init_rc), (ttusb_dec_exit_rc), + (ttusb_dec_probe): + * ../linux/drivers/media/video/bttvp.h: + * ../linux/drivers/media/video/cx88/cx88-input.c: + (cx88_ir_handle_key), (cx88_ir_init), (cx88_ir_fini), + (cx88_ir_irq): + * ../linux/drivers/media/video/ir-kbd-gpio.c: (ir_handle_key), + (ir_rc5_timer_end), (ir_rc5_timer_keyup), (ir_probe), (ir_remove): + * ../linux/drivers/media/video/ir-kbd-i2c.c: (ir_key_poll), + (ir_attach), (ir_detach): + * ../linux/drivers/media/video/saa7134/saa7134-input.c: + (build_key), (saa7134_input_init1), (saa7134_input_fini): + * ../linux/drivers/media/video/saa7134/saa7134.h: + * ../linux/include/media/ir-kbd-i2c.h: + * ../v4l/compat.h: + + - Backport of Dmitry Torokhov's input layer changes at mainline + kernel (kernel sync) + - Added backwards compatibility checks for kernels < 2.6.15 + + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2005-12-02 23:00 hverkuil * ../linux/drivers/media/video/tda9887.c: (tda9887_command): diff --git a/v4l/compat.h b/v4l/compat.h index 37fa7b8e8..b6b4e82dc 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.36 2005/11/23 07:24:54 mkrufky Exp $ + * $Id: compat.h,v 1.37 2005/12/04 01:12:43 rmcc Exp $ */ #ifndef _COMPAT_H @@ -262,6 +262,11 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) #endif #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) +# define input_allocate_device() kzalloc(sizeof(struct input_dev),GFP_KERNEL); +# define input_free_device(input_dev) kfree(input_dev) +#endif + #endif /* * Local variables: |