diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 13:58:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 13:58:54 -0300 |
| commit | ce486a4e35fc5f89c56f1bc8db8ad09cb9e3a98e (patch) | |
| tree | bf90690073c0667a01166bbefd5dc1ae0398fe44 /linux/drivers/media/video/cafe_ccic.c | |
| parent | db44a7d2b169cceeafa7a8b5fc5b8fe921d4088d (diff) | |
| parent | 6971a9d650f6ab06dfedc4464665366c87da4bbc (diff) | |
| download | mediapointer-dvb-s2-ce486a4e35fc5f89c56f1bc8db8ad09cb9e3a98e.tar.gz mediapointer-dvb-s2-ce486a4e35fc5f89c56f1bc8db8ad09cb9e3a98e.tar.bz2 | |
merge: http://kernellabs.com/hg/~mkrufky/sms1xxx
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cafe_ccic.c')
| -rw-r--r-- | linux/drivers/media/video/cafe_ccic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cafe_ccic.c b/linux/drivers/media/video/cafe_ccic.c index 4b8ecad1b..2c78c35e8 100644 --- a/linux/drivers/media/video/cafe_ccic.c +++ b/linux/drivers/media/video/cafe_ccic.c @@ -491,7 +491,6 @@ static int cafe_smbus_setup(struct cafe_camera *cam) int ret; cafe_smbus_enable_irq(cam); - adap->id = I2C_HW_SMBUS_CAFE; adap->owner = THIS_MODULE; adap->algo = &cafe_smbus_algo; strcpy(adap->name, "cafe_ccic"); |