diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-03-22 18:44:06 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-22 18:44:06 +0400 |
| commit | 1898f4426b3863216a9041389b34a3b995883027 (patch) | |
| tree | 1f1fa81d13ab229c3efea589e79135912b5260e6 /drivers/staging | |
| parent | 5466c7b1683a23dbbcfb7ee4a71c4f23886001c7 (diff) | |
| parent | 6544599249086ce50f216a6cedbea56514ffefc6 (diff) | |
| download | linux-1898f4426b3863216a9041389b34a3b995883027.tar.xz | |
Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-next
* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/dp: support version 4.0 of DP table
drm/nve0/disp: nvidia randomly decided to move the dithering method
drm/nve0: initial modesetting support for kepler chipsets
drm/nouveau: add bios connector type for dms59
drm/nouveau: move out of staging drivers
drm/nouveau: bump version to 1.0.0
drm/nvd0/disp: ignore clock set if no pclk
drm/nouveau: oops, increase channel dispc_vma to 4
drm/nouveau: inform userspace of new kernel subchannel requirements
drm/nouveau: remove m2mf creation on userspace channels
drm/nvc0-/disp: reimplement flip completion method as fifo method
drm/nouveau: move fence sequence check to start of loop
drm/nouveau: remove subchannel names from places where it doesn't matter
drm/nouveau/ttm: always do buffer moves on kernel channel
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 9e6347249783..733b6b6191cc 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -64,8 +64,6 @@ source "drivers/staging/phison/Kconfig" source "drivers/staging/line6/Kconfig" -source "drivers/gpu/drm/nouveau/Kconfig" - source "drivers/staging/octeon/Kconfig" source "drivers/staging/serqt_usb2/Kconfig" |