diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:50:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:50:49 -0500 |
commit | 3e7468313758913c5e4d372f35b271b96bad1298 (patch) | |
tree | eb612d252a9e2349a1173451cd779beebd18a33e /drivers/media/video/em28xx/em28xx.h | |
parent | 6825fbc4cb219f2c98bb7d157915d797cf5cb823 (diff) | |
parent | e97f4677961f68e29bd906022ebf60a6df7f530a (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
V4L/DVB (13542): ir-keytable: Allow dynamic table change
V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
V4L/DVB (13540): ir-common: Cleanup get key evdev code
V4L/DVB (13539): ir-common: add __func__ for debug messages
V4L/DVB (13538): ir-common: Use a dynamic keycode table
V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
V4L/DVB (13534): ir-common: Remove some unused fields/structs
V4L/DVB (13533): ir: use dynamic tables, instead of static ones
V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
V4L/DVB (13458): go7007: subdev conversion
V4L/DVB (13457): s2250: subdev conversion
V4L/DVB (13456): s2250: Change module structure
V4L/DVB (13528): em28xx: add support for em2800 VC211A card
em28xx: don't reduce scale to half size for em2800
em28xx: don't load audio modules when AC97 is mis-detected
em28xx: em2800 chips support max width of 640
V4L/DVB (13523): dvb-bt8xx: fix compile warning
...
Fix up trivial conflicts due to spelling fixes from the trivial tree in
Documentation/video4linux/gspca.txt
drivers/media/video/cx18/cx18-mailbox.h
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 0a73e8bf0d6e..441df644ddbe 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
@@ -110,6 +110,7 @@ | |||
110 | #define EM2820_BOARD_SILVERCREST_WEBCAM 71 | 110 | #define EM2820_BOARD_SILVERCREST_WEBCAM 71 |
111 | #define EM2861_BOARD_GADMEI_UTV330PLUS 72 | 111 | #define EM2861_BOARD_GADMEI_UTV330PLUS 72 |
112 | #define EM2870_BOARD_REDDO_DVB_C_USB_BOX 73 | 112 | #define EM2870_BOARD_REDDO_DVB_C_USB_BOX 73 |
113 | #define EM2800_BOARD_VC211A 74 | ||
113 | 114 | ||
114 | /* Limits minimum and default number of buffers */ | 115 | /* Limits minimum and default number of buffers */ |
115 | #define EM28XX_MIN_BUF 4 | 116 | #define EM28XX_MIN_BUF 4 |
@@ -143,9 +144,6 @@ | |||
143 | */ | 144 | */ |
144 | #define EM28XX_NUM_PACKETS 40 | 145 | #define EM28XX_NUM_PACKETS 40 |
145 | 146 | ||
146 | /* default alternate; 0 means choose the best */ | ||
147 | #define EM28XX_PINOUT 0 | ||
148 | |||
149 | #define EM28XX_INTERLACED_DEFAULT 1 | 147 | #define EM28XX_INTERLACED_DEFAULT 1 |
150 | 148 | ||
151 | /* | 149 | /* |
@@ -615,7 +613,6 @@ struct em28xx { | |||
615 | struct em28xx_dvb *dvb; | 613 | struct em28xx_dvb *dvb; |
616 | 614 | ||
617 | /* I2C keyboard data */ | 615 | /* I2C keyboard data */ |
618 | struct i2c_board_info info; | ||
619 | struct IR_i2c_init_data init_data; | 616 | struct IR_i2c_init_data init_data; |
620 | }; | 617 | }; |
621 | 618 | ||
@@ -800,7 +797,7 @@ static inline unsigned int norm_maxw(struct em28xx *dev) | |||
800 | if (dev->board.is_webcam) | 797 | if (dev->board.is_webcam) |
801 | return dev->sensor_xres; | 798 | return dev->sensor_xres; |
802 | 799 | ||
803 | if (dev->board.max_range_640_480) | 800 | if (dev->board.max_range_640_480 || dev->board.is_em2800) |
804 | return 640; | 801 | return 640; |
805 | 802 | ||
806 | return 720; | 803 | return 720; |