git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
Kconfig
diff --git
a/drivers/gpu/drm/nouveau/Kconfig
b/drivers/gpu/drm/nouveau/Kconfig
index 1175429da1029bf18feb23813aaa223cae651283..d2d28048efb23e1759c4368a2dbb2a64ac12675e 100644
(file)
--- a/
drivers/gpu/drm/nouveau/Kconfig
+++ b/
drivers/gpu/drm/nouveau/Kconfig
@@
-1,6
+1,6
@@
config DRM_NOUVEAU
tristate "Nouveau (nVidia) cards"
config DRM_NOUVEAU
tristate "Nouveau (nVidia) cards"
- depends on DRM
+ depends on DRM
&& PCI
select FW_LOADER
select DRM_KMS_HELPER
select DRM_TTM
select FW_LOADER
select DRM_KMS_HELPER
select DRM_TTM
@@
-41,4
+41,13
@@
config DRM_I2C_CH7006
This driver is currently only useful if you're also using
the nouveau driver.
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
endmenu