diff options
Diffstat (limited to 'linux/drivers/media/video/ir-kbd-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-i2c.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c index 01b4f3f11..86965c710 100644 --- a/linux/drivers/media/video/ir-kbd-i2c.c +++ b/linux/drivers/media/video/ir-kbd-i2c.c @@ -1,5 +1,5 @@ /* - * $Id: ir-kbd-i2c.c,v 1.30 2005/12/08 21:02:56 mchehab Exp $ + * $Id: ir-kbd-i2c.c,v 1.31 2006/01/07 20:43:23 mchehab Exp $ * * keyboard input driver for i2c IR remote controls * @@ -280,9 +280,18 @@ static int ir_detach(struct i2c_client *client); static int ir_probe(struct i2c_adapter *adap); static struct i2c_driver driver = { - .name = "ir remote kbd driver", - .id = I2C_DRIVERID_INFRARED, +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)) + .owner = THIS_MODULE; +#endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) + .name = "ir-kbd-i2c", .flags = I2C_DF_NOTIFY, +#else + .driver = { + .name = "ir-kbd-i2c", + }, +#endif + .id = I2C_DRIVERID_INFRARED, .attach_adapter = ir_probe, .detach_client = ir_detach, }; |