From d7eb6a3ea924a86210b50425a615f0b495c67630 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Thu, 24 Jan 2013 21:46:07 +0000 Subject: [PATCH] --- yaml --- r: 358147 b: refs/heads/master c: 6504d0d9900a2c05ea1fbab2ec008bf442993d94 h: refs/heads/master i: 358145: 90433ecaf8d08d208c1e0ff649cf6ad15c29ed64 358143: 8a426b6a1e547860c06c0bdb047af4adfdd2fda0 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/Kconfig | 2 ++ trunk/drivers/gpu/drm/i2c/Kconfig | 22 ++++++++++++++++++++++ trunk/drivers/gpu/drm/nouveau/Kconfig | 23 ----------------------- 4 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 trunk/drivers/gpu/drm/i2c/Kconfig diff --git a/[refs] b/[refs] index b95f35e61a05..d5c068e30c83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73ccd6962fff19e53a7d4baaa17cf9311284ac9c +refs/heads/master: 6504d0d9900a2c05ea1fbab2ec008bf442993d94 diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/drivers/gpu/drm/Kconfig index 3399b209260a..ed9e3af17b31 100644 --- a/trunk/drivers/gpu/drm/Kconfig +++ b/trunk/drivers/gpu/drm/Kconfig @@ -69,6 +69,8 @@ config DRM_KMS_CMA_HELPER help Choose this if you need the KMS CMA helper functions +source "drivers/gpu/drm/i2c/Kconfig" + config DRM_TDFX tristate "3dfx Banshee/Voodoo3+" depends on DRM && PCI diff --git a/trunk/drivers/gpu/drm/i2c/Kconfig b/trunk/drivers/gpu/drm/i2c/Kconfig new file mode 100644 index 000000000000..16118363509a --- /dev/null +++ b/trunk/drivers/gpu/drm/i2c/Kconfig @@ -0,0 +1,22 @@ +menu "I2C encoder or helper chips" + depends on DRM && DRM_KMS_HELPER && I2C + +config DRM_I2C_CH7006 + tristate "Chrontel ch7006 TV encoder" + default m if DRM_NOUVEAU + help + Support for Chrontel ch7006 and similar TV encoders, found + on some nVidia video cards. + + This driver is currently only useful if you're also using + the nouveau driver. + +config DRM_I2C_SIL164 + tristate "Silicon Image sil164 TMDS transmitter" + default m if DRM_NOUVEAU + help + Support for sil164 and similar single-link (or dual-link + when used in pairs) TMDS transmitters, used in some nVidia + video cards. + +endmenu diff --git a/trunk/drivers/gpu/drm/nouveau/Kconfig b/trunk/drivers/gpu/drm/nouveau/Kconfig index 8a55beeb8bdc..47ccc1ad5405 100644 --- a/trunk/drivers/gpu/drm/nouveau/Kconfig +++ b/trunk/drivers/gpu/drm/nouveau/Kconfig @@ -52,26 +52,3 @@ config DRM_NOUVEAU_BACKLIGHT help Say Y here if you want to control the backlight of your display (e.g. a laptop panel). - -menu "I2C encoder or helper chips" - depends on DRM && DRM_KMS_HELPER && I2C - -config DRM_I2C_CH7006 - tristate "Chrontel ch7006 TV encoder" - default m if DRM_NOUVEAU - help - Support for Chrontel ch7006 and similar TV encoders, found - on some nVidia video cards. - - This driver is currently only useful if you're also using - the nouveau driver. - -config DRM_I2C_SIL164 - tristate "Silicon Image sil164 TMDS transmitter" - default m if DRM_NOUVEAU - help - Support for sil164 and similar single-link (or dual-link - when used in pairs) TMDS transmitters, used in some nVidia - video cards. - -endmenu