diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 13:42:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-22 13:42:54 -0400 |
| commit | 4e93d3e8859c834ee18dfd33051d24df8669d0c0 (patch) | |
| tree | 13f5b39730857257b5040471618e9bcce30ed9cc /drivers/media/video/saa7134/saa6752hs.c | |
| parent | a0cd30fd26a398c0c6e50c6760610d4529f17a84 (diff) | |
| parent | 0087e5ef577d0d6e664be7ab4be513b6a482e7ec (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/media/video/saa7134/saa6752hs.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa6752hs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c index 1db022682980..42c2b565c9fe 100644 --- a/drivers/media/video/saa7134/saa6752hs.c +++ b/drivers/media/video/saa7134/saa6752hs.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | /* Addresses to scan */ | 23 | /* Addresses to scan */ |
| 24 | static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END}; | 24 | static unsigned short normal_i2c[] = {0x20, I2C_CLIENT_END}; |
| 25 | static unsigned short normal_i2c_range[] = {I2C_CLIENT_END}; | ||
| 26 | I2C_CLIENT_INSMOD; | 25 | I2C_CLIENT_INSMOD; |
| 27 | 26 | ||
| 28 | MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder"); | 27 | MODULE_DESCRIPTION("device driver for saa6752hs MPEG2 encoder"); |