commit 8a8ed67227c0082c9873dc7feb3a53ae7a2674f3 Author: Ronald Uitermark Date: Sat Aug 25 20:36:28 2012 +0200 Recent rewrite broke building the kernel without AGP make this conditional so we can proceed with testing. For reference, the error was: CC drivers/gpu/drm/nouveau/nouveau_bo.o drivers/gpu/drm/nouveau/nouveau_bo.c: In function 'nouveau_ttm_tt_create': drivers/gpu/drm/nouveau/nouveau_bo.c:463:3: error: implicit declaration of function 'ttm_agp_tt_create' drivers/gpu/drm/nouveau/nouveau_bo.c:463:3: attention: return makes pointer from integer without a cast diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 259e5f1..56526c4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -459,10 +459,12 @@ nouveau_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size, struct nouveau_drm *drm = nouveau_bdev(bdev); struct drm_device *dev = drm->dev; +#if __OS_HAS_AGP if (drm->agp.stat == ENABLED) { return ttm_agp_tt_create(bdev, dev->agp->bridge, size, page_flags, dummy_read); } +#endif return nouveau_sgdma_create_ttm(bdev, size, page_flags, dummy_read); }