Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / drivers / gpu / drm / nouveau / Kconfig

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index b1bc1ea..1175429 100644 (file)
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -30,12 +30,11 @@ config DRM_NOUVEAU_DEBUG
          via debugfs.
 
 menu "I2C encoder or helper chips"
          via debugfs.
 
 menu "I2C encoder or helper chips"

-     depends on DRM && I2C
+     depends on DRM && DRM_KMS_HELPER && I2C

 
 config DRM_I2C_CH7006
        tristate "Chrontel ch7006 TV encoder"
 
 config DRM_I2C_CH7006
        tristate "Chrontel ch7006 TV encoder"

-       depends on DRM_NOUVEAU
-       default m
+       default m if DRM_NOUVEAU

        help
          Support for Chrontel ch7006 and similar TV encoders, found
          on some nVidia video cards.
        help
          Support for Chrontel ch7006 and similar TV encoders, found
          on some nVidia video cards.