diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 19:42:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 19:42:54 +0200 |
| commit | 4e93d3e8859c834ee18dfd33051d24df8669d0c0 (patch) | |
| tree | 13f5b39730857257b5040471618e9bcce30ed9cc /drivers/media/video/tuner-3036.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 (diff) | |
| parent | [PATCH] I2C: fix ds1374 build (diff) | |
| download | linux-4e93d3e8859c834ee18dfd33051d24df8669d0c0.tar.xz linux-4e93d3e8859c834ee18dfd33051d24df8669d0c0.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/media/video/tuner-3036.c')
| -rw-r--r-- | drivers/media/video/tuner-3036.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c index 6b20aa902a8f..51748c6578d1 100644 --- a/drivers/media/video/tuner-3036.c +++ b/drivers/media/video/tuner-3036.c @@ -34,19 +34,14 @@ static int this_adap; static struct i2c_client client_template; /* Addresses to scan */ -static unsigned short normal_i2c[] = {I2C_CLIENT_END}; -static unsigned short normal_i2c_range[] = {0x60, 0x61, I2C_CLIENT_END}; -static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; -static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; -static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; -static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; -static unsigned short force[2] = { I2C_CLIENT_END, I2C_CLIENT_END }; +static unsigned short normal_i2c[] = { 0x60, 0x61, I2C_CLIENT_END }; +static unsigned short ignore = I2C_CLIENT_END; static struct i2c_client_address_data addr_data = { - normal_i2c, normal_i2c_range, - probe, probe_range, - ignore, ignore_range, - force + .normal_i2c = normal_i2c, + .probe = &ignore, + .ignore = &ignore, + .force = &ignore, }; /* ---------------------------------------------------------------------- */ |