Skip to content

Commit

Permalink
V4L/DVB (5014): Allyesconfig build fixes on some non x86 arch
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
David Brownell authored and Mauro Carvalho Chehab committed Dec 27, 2006
1 parent 5f1693f commit 9a2816c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/media/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/video/em28xx/em28xx-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 9a2816c

Please sign in to comment.