diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2009-12-14 11:51:40 -0800 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2009-12-15 09:49:18 +1000 |
commit | 61c2bb45697a56e96313a5f85f609b0c12ae26ff (patch) | |
tree | 54253325a7ca2658626ed589e18ae18a11beeb7b /drivers/gpu | |
parent | 6ee738610f41b59733f63718f0bdbcba7d3a3f12 (diff) | |
download | linux-3.10-61c2bb45697a56e96313a5f85f609b0c12ae26ff.tar.gz linux-3.10-61c2bb45697a56e96313a5f85f609b0c12ae26ff.tar.bz2 linux-3.10-61c2bb45697a56e96313a5f85f609b0c12ae26ff.zip |
drm/nouveau: fix ch7006 build
The ch7006 driver could be built even when nouveau was not enabled,
but the build fails in that case, so make it depend on DRM_NOUVEUA.
Also make the I2c encoder/helper chips menu depend on I2C (no build
error, just visual inspection).
ERROR: "drm_helper_probe_single_connector_modes" [drivers/gpu/drm/i2c/ch7006.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index d823e631951..b1bc1ea182b 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -30,11 +30,12 @@ config DRM_NOUVEAU_DEBUG via debugfs. menu "I2C encoder or helper chips" - depends on DRM + depends on DRM && I2C config DRM_I2C_CH7006 tristate "Chrontel ch7006 TV encoder" - default m if DRM_NOUVEAU + depends on DRM_NOUVEAU + default m help Support for Chrontel ch7006 and similar TV encoders, found on some nVidia video cards. |