Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a2816c1 authored by David Brownell's avatar David Brownell Committed by Mauro Carvalho Chehab
Browse files

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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 5f1693fe

drivers/media/video/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/video/em28xx/em28xx-video.c

+2 −2
Original line number Diff line number Diff line
@@ -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);