diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 14:32:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 14:32:49 -0800 |
| commit | 9764757932ce26f139332f89d1d3b815e4cc56ab (patch) | |
| tree | cda405e75ecd7e478cbee85cfe1c5ebd1ecabcc6 /drivers/staging | |
| parent | 9148bce4a7d7b532e49a3bc546f1703a58dfad45 (diff) | |
| parent | 6ee738610f41b59733f63718f0bdbcba7d3a3f12 (diff) | |
Merge branch 'drm-nouveau-pony' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-nouveau-pony' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/nouveau: Add DRM driver for NVIDIA GPUs
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index dfcd75cf490..80e71fce185 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -103,6 +103,8 @@ source "drivers/staging/line6/Kconfig" source "drivers/gpu/drm/radeon/Kconfig" +source "drivers/gpu/drm/nouveau/Kconfig" + source "drivers/staging/octeon/Kconfig" source "drivers/staging/serqt_usb2/Kconfig" |