[-next] gpu/drm: fix build errors and kconfig dependency warnings

Commit Message

Randy Dunlap Oct. 13, 2010, 7:57 p.m. UTC

None

Patch

--- linux-next-20101013.orig/drivers/gpu/drm/nouveau/Kconfig
+++ linux-next-20101013/drivers/gpu/drm/nouveau/Kconfig
@@ -1,16 +1,17 @@ 
 config DRM_NOUVEAU
 	tristate "Nouveau (nVidia) cards"
-	depends on DRM && PCI
+	depends on DRM && PCI && HWMON
+	depends on FB
         select FW_LOADER
 	select DRM_KMS_HELPER
 	select DRM_TTM
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
-	select FB
 	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
 	select ACPI_VIDEO if ACPI
+	select VIDEO_OUTPUT_CONTROL if ACPI
 	help
 	  Choose this option for open-source nVidia support.
 
--- linux-next-20101013.orig/drivers/gpu/drm/Kconfig
+++ linux-next-20101013/drivers/gpu/drm/Kconfig
@@ -22,7 +22,7 @@  menuconfig DRM
 config DRM_KMS_HELPER
 	tristate
 	depends on DRM
-	select FB
+	depends on FB
 	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	help
 	  FB and CRTC helpers for KMS drivers.