From 891b1a330d34434953b744f5b470acf01cbcd1df Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 7 Jan 2006 20:43:22 +0000 Subject: Some cleanups at I2C modules - Latest patch reverted, since __stringfy seems to be needed for kernel < 2.6.15 - Applied kernel I2C cleanups from Jean Delaware. - driver names simplified to allow usage of newer printk macros at v4l2-common.h Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/tda7432.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'linux/drivers/media/video/tda7432.c') diff --git a/linux/drivers/media/video/tda7432.c b/linux/drivers/media/video/tda7432.c index c5b2fdfdf..7b68530b1 100644 --- a/linux/drivers/media/video/tda7432.c +++ b/linux/drivers/media/video/tda7432.c @@ -531,12 +531,18 @@ static int tda7432_command(struct i2c_client *client, } static struct i2c_driver driver = { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,54) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)) .owner = THIS_MODULE, #endif - .name = "i2c tda7432 driver", - .id = I2C_DRIVERID_TDA7432, +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) + .name = "tda7432", .flags = I2C_DF_NOTIFY, +#else + .driver = { + .name = "tda7432", + }, +#endif + .id = I2C_DRIVERID_TDA7432, .attach_adapter = tda7432_probe, .detach_client = tda7432_detach, .command = tda7432_command, -- cgit v1.2.3