From: Daniel Vetter Date: Wed, 10 Jul 2013 12:11:54 +0000 (+0200) Subject: drm/nouveau: drop DRIVER_PCI_DMA and DRIVER_SG X-Git-Tag: v3.12-rc1~136^2~157 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4cb4ea39cd61a9d71bf7227c5927c870fdde710c;p=linux.git drm/nouveau: drop DRIVER_PCI_DMA and DRIVER_SG The former doesn't do anything without DRIVER_HAVE_DMA (which is force-disabled for kms drivers anyway). The latter isn't used by the (kms) nouveau ddx. Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 218a4b522fe5..e990327d117a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -675,7 +675,7 @@ nouveau_driver_fops = { static struct drm_driver driver = { .driver_features = - DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG | + DRIVER_USE_AGP | DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME, .load = nouveau_drm_load,