Commit 8f057d7b authored Aug 20, 2012 by Guenter Roeck Committed by Greg Kroah-Hartman Aug 20, 2012

gpu/mfd/usb: Fix USB randconfig problems



Fix config warning:

warning: ( ... && DRM_USB) selects USB which has unmet direct dependencies
(USB_SUPPORT && USB_ARCH_HAS_HCD)

and build error:
ERROR: "usb_speed_string" [drivers/usb/core/usbcore.ko] undefined!

by adding the missing dependency on USB_ARCH_HAS_HCD to DRM_UDL and DRM_USB.

This exposes:
drivers/video/Kconfig:36:error: recursive dependency detected!
drivers/video/Kconfig:36:       symbol FB is selected by DRM_KMS_HELPER
drivers/gpu/drm/Kconfig:28:     symbol DRM_KMS_HELPER is selected by DRM_UDL
drivers/gpu/drm/udl/Kconfig:1:  symbol DRM_UDL depends on USB_ARCH_HAS_HCD
drivers/usb/Kconfig:78: symbol USB_ARCH_HAS_HCD depends on USB_ARCH_HAS_OHCI
drivers/usb/Kconfig:16: symbol USB_ARCH_HAS_OHCI depends on I2C
drivers/i2c/Kconfig:5:  symbol I2C is selected by FB_DDC
drivers/video/Kconfig:86:       symbol FB_DDC is selected by FB_CYBER2000_DDC
drivers/video/Kconfig:385:      symbol FB_CYBER2000_DDC depends on FB_CYBER2000
drivers/video/Kconfig:373:      symbol FB_CYBER2000 depends on FB

which is due to drivers/usb/Kconfig:
config USB_ARCH_HAS_OHCI
	...
	default y if ARCH_PNX4008 && I2C

Fix by dropping I2C from the above dependency; logic is that this is not a
platform dependency but a configuration dependency: the _architecture_ still
supports USB even is I2C is not selected.

This exposes:
drivers/video/Kconfig:36:error: recursive dependency detected!
drivers/video/Kconfig:36:       symbol FB is selected by DRM_KMS_HELPER
drivers/gpu/drm/Kconfig:28:     symbol DRM_KMS_HELPER is selected by DRM_UDL
drivers/gpu/drm/udl/Kconfig:1:  symbol DRM_UDL depends on USB_ARCH_HAS_HCD
drivers/usb/Kconfig:78: symbol USB_ARCH_HAS_HCD depends on USB_ARCH_HAS_OHCI
drivers/usb/Kconfig:17: symbol USB_ARCH_HAS_OHCI depends on MFD_TC6393XB
drivers/mfd/Kconfig:396:        symbol MFD_TC6393XB depends on GPIOLIB
drivers/gpio/Kconfig:35:        symbol GPIOLIB is selected by FB_VIA
drivers/video/Kconfig:1560:     symbol FB_VIA depends on FB

which can be fixed by having MFD_TC6393XB select GPIOLIB instead of depending on
it.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 99f347ca

drivers/gpu/drm/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ menuconfig DRM
		config DRM_USB
		tristate
		depends on DRM
		depends on USB_ARCH_HAS_HCD
		select USB

		config DRM_KMS_HELPER

drivers/gpu/drm/udl/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		config DRM_UDL
		tristate "DisplayLink"
		depends on DRM && EXPERIMENTAL
		depends on USB_ARCH_HAS_HCD
		select DRM_USB
		select FB_SYS_FILLRECT
		select FB_SYS_COPYAREA

drivers/mfd/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -395,7 +395,8 @@ config MFD_TC6387XB

		config MFD_TC6393XB
		bool "Support Toshiba TC6393XB"
		depends on GPIOLIB && ARM && HAVE_CLK
		depends on ARM && HAVE_CLK
		select GPIOLIB
		select MFD_CORE
		select MFD_TMIO
		help

drivers/usb/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ config USB_ARCH_HAS_OHCI
		default y if PXA3xx
		default y if ARCH_EP93XX
		default y if ARCH_AT91
		default y if ARCH_PNX4008 && I2C
		default y if ARCH_PNX4008
		default y if MFD_TC6393XB
		default y if ARCH_W90X900
		default y if ARCH_DAVINCI_DA8XX

Admin message