diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-11 12:43:11 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-11 12:43:11 -0400 |
commit | e7578c08a4dee36fe01fb38805f325689e642eb0 (patch) | |
tree | 7426054f6226aa2349ee0c0a3970aeef9276ea59 /drivers/char/drm/Kconfig | |
parent | 763b3917e779c9c25d56fc71a796774185cd6ce2 (diff) | |
parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/char/drm/Kconfig')
-rw-r--r-- | drivers/char/drm/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig index c2b12eab67c9..123417e43040 100644 --- a/drivers/char/drm/Kconfig +++ b/drivers/char/drm/Kconfig | |||
@@ -96,3 +96,10 @@ config DRM_SIS | |||
96 | chipset. If M is selected the module will be called sis. AGP | 96 | chipset. If M is selected the module will be called sis. AGP |
97 | support is required for this driver to work. | 97 | support is required for this driver to work. |
98 | 98 | ||
99 | config DRM_VIA | ||
100 | tristate "Via unichrome video cards" | ||
101 | depends on DRM | ||
102 | help | ||
103 | Choose this option if you have a Via unichrome or compatible video | ||
104 | chipset. If M is selected the module will be called via. | ||
105 | |||