diff options
| author | David Brownell <david-b@pacbell.net> | 2006-12-27 09:53:44 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-27 14:20:41 -0200 |
| commit | 9a2816c1c4ca7f5d02de4339589913701251dd5a (patch) | |
| tree | c33414ea30b351d0941f7a64acca3dd99adaf0ab /drivers/media/video | |
| parent | 5f1693fe82b499a3306993020ef14011ed0420d0 (diff) | |
| download | blackbird-op-linux-9a2816c1c4ca7f5d02de4339589913701251dd5a.tar.gz blackbird-op-linux-9a2816c1c4ca7f5d02de4339589913701251dd5a.zip | |
V4L/DVB (5014): Allyesconfig build fixes on some non x86 arch
- CAFE_CCIC needs to depend on PCI, else "allyesconfig" breaks
on systems without PCI
- em28xx-video can't udelay(2500) else "allyesconfig" breaks
on systems that refuse to spin that long (I saw it on ARM)
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 29a11c1db1b7..57357db31b8a 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -668,7 +668,7 @@ config VIDEO_M32R_AR_M64278 config VIDEO_CAFE_CCIC tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" - depends on I2C && VIDEO_V4L2 + depends on PCI && I2C && VIDEO_V4L2 select VIDEO_OV7670 ---help--- This is a video4linux2 driver for the Marvell 88ALP01 integrated diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 2a461dde480c..36e72c207a8f 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c @@ -1674,9 +1674,9 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, if (dev->has_msp34xx) { /* Send a reset to other chips via gpio */ em28xx_write_regs_req(dev, 0x00, 0x08, "\xf7", 1); - udelay(2500); + msleep(3); em28xx_write_regs_req(dev, 0x00, 0x08, "\xff", 1); - udelay(2500); + msleep(3); } video_mux(dev, 0); |
