From 0ec6de1c0fd4aee2037559520db72b6271f2fba3 Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Wed, 18 Aug 2004 16:01:48 +0000 Subject: - remove dvb i2c code (all drivers are ported to kernel i2c) - remove dvb i2c frontend (un)register code (all drivers use non-i2c frontend calls now) - add i2c driver ids for all frontends to dvb_frontend.h (should be submitted to i2c-id.h) - fix usage of i2c driver ids in dst, ves1x93, nxt6000 drivers - remove dvb i2c functionality from av7110 and budget drivers - remove dvb i2c functionality from Skystar2 driver - fix up kernel Makefile - add a FE_ATSC case to avoid compiler warning (print warning message instead) --- linux/drivers/media/dvb/frontends/nxt6000.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'linux/drivers/media/dvb/frontends/nxt6000.c') diff --git a/linux/drivers/media/dvb/frontends/nxt6000.c b/linux/drivers/media/dvb/frontends/nxt6000.c index 578451749..cb0346ce4 100644 --- a/linux/drivers/media/dvb/frontends/nxt6000.c +++ b/linux/drivers/media/dvb/frontends/nxt6000.c @@ -34,9 +34,6 @@ #include "dvb_frontend.h" #include "nxt6000.h" -/* fixme: add this to i2c-id.h */ -#define I2C_DRIVERID_NXT6000 I2C_DRIVERID_EXP1 - MODULE_DESCRIPTION("NxtWave NXT6000 DVB demodulator driver"); MODULE_AUTHOR("Florian Schirmer"); MODULE_LICENSE("GPL"); @@ -824,7 +821,7 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg) static struct i2c_driver driver = { .owner = THIS_MODULE, .name = "nxt6000", - .id = I2C_DRIVERID_NXT6000, + .id = I2C_DRIVERID_DVBFE_NXT6000, .flags = I2C_DF_NOTIFY, .attach_adapter = attach_adapter, .detach_client = detach_client, -- cgit v1.2.3