diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 10:33:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 10:33:10 +1000 |
| commit | 3de8c6b335292671a9a5fd048ceb17d7b24c1202 (patch) | |
| tree | 0fd1641b8a37f96380bcef40aa7248e382731fa6 /drivers/media/video/cafe_ccic.c | |
| parent | c35c44fe975c8acbc6ba82f12dad85549f881950 (diff) | |
| parent | 218fec7eef0f3fe5dccdea760bfbd3fd339c5a15 (diff) | |
Merge commit 'v4l-dvb/master'
Conflicts:
drivers/media/video/gspca/Kconfig
drivers/media/video/sh_mobile_ceu_camera.c
Diffstat (limited to 'drivers/media/video/cafe_ccic.c')
| -rw-r--r-- | drivers/media/video/cafe_ccic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index c4d181dde1ca..9c149a781294 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c @@ -490,7 +490,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"); |