diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 21:20:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 21:20:39 -0700 |
| commit | 8d15b0ec32f20a57881dc073b2e8d11dea0ccceb (patch) | |
| tree | 8aa3d4dfd0660807c3ce2893b35292b3b0e3bf08 /drivers/staging | |
| parent | 005411c3e9147bc3b78215390e847d688dbbc163 (diff) | |
| parent | cc8da5263fa743c33d6503f85113bcb70048e633 (diff) | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon: switch to using late_initcall
radeon legacy chips: tv dac bg/dac adj updates
drm/radeon: introduce kernel modesetting for radeon hardware
drm: Add the TTM GPU memory manager subsystem.
drm: Memory fragmentation from lost alignment blocks
drm/radeon: fix mobility flags on new PCI IDs.
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 0dcf9ca0b0a..d0fcf36c2ab 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -115,5 +115,7 @@ source "drivers/staging/line6/Kconfig" source "drivers/staging/serqt_usb/Kconfig" +source "drivers/gpu/drm/radeon/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGING |