diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-10-11 03:43:58 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-11-18 14:38:20 +1000 |
| commit | cbab95db84f2a444d99bec77bac8b9b6ef20d11c (patch) | |
| tree | 0c1e2c1f53d5ba8c40db15c4f836eac57c883ec1 /drivers/gpu/drm/nouveau/nouveau_mem.c | |
| parent | 5eb94fbba39e71f04d629f8197343273b56e25eb (diff) | |
| download | talos-obmc-linux-cbab95db84f2a444d99bec77bac8b9b6ef20d11c.tar.gz talos-obmc-linux-cbab95db84f2a444d99bec77bac8b9b6ef20d11c.zip | |
drm/nouveau: Some random cleanups.
Remove some unused/duplicated definitions and make sparse happy again.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index a163c7c612e7..1165c3e68200 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -33,9 +33,9 @@ #include "drmP.h" #include "drm.h" #include "drm_sarea.h" -#include "nouveau_drv.h" -#define MIN(a,b) a < b ? a : b +#include "nouveau_drv.h" +#include "nouveau_pm.h" /* * NV10-NV40 tiling helpers @@ -719,7 +719,7 @@ nouveau_mem_timing_init(struct drm_device *dev) tUNK_19 = 1; tUNK_20 = 0; tUNK_21 = 0; - switch (MIN(recordlen,21)) { + switch (min(recordlen, 21)) { case 21: tUNK_21 = entry[21]; case 20: |
