From bd68b07d18267e4235370bb4123b5274554b840a Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 27 Dec 2006 09:53:44 -0300 Subject: [PATCH] --- yaml --- r: 45090 b: refs/heads/master c: 9a2816c1c4ca7f5d02de4339589913701251dd5a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/Kconfig | 2 +- trunk/drivers/media/video/em28xx/em28xx-video.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d3474d98d982..e86b6cb63bdc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f1693fe82b499a3306993020ef14011ed0420d0 +refs/heads/master: 9a2816c1c4ca7f5d02de4339589913701251dd5a diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index 29a11c1db1b7..57357db31b8a 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/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/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c index 2a461dde480c..36e72c207a8f 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-video.c +++ b/trunk/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);