From baed71aaca1a09faf2b7e5619a3b6cd59f810399 Mon Sep 17 00:00:00 2001
From: Xavier Chantry <chantry.xavier@gmail.com>
Date: Mon, 5 Jul 2010 21:58:41 +0200
Subject: Silence some compiler warning

Signed-off-by: Patrice Mandin <patmandin@gmail.com>
---
 screen.c   | 4 +++-
 tcl_init.c | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/screen.c b/screen.c
index 524c7fd..5a36f9c 100644
--- a/screen.c
+++ b/screen.c
@@ -2,6 +2,8 @@
 
 #include <stdio.h>
 #include <stdint.h>
+#include <inttypes.h>
+
 #include <nouveau_drm.h>
 #include <nouveau_drmif.h>
 #include <nouveau_bo.h>
@@ -44,7 +46,7 @@ int screen_open(int width, int height, int bpp)
 	}
 
 	printf("screen: chipset: 0x%08x\n", dev->chipset);
-	printf("screen: vm_vram_base: 0x%lx\n", dev->vm_vram_base);
+	printf("screen: vm_vram_base: 0x%" PRIu64 "\n", dev->vm_vram_base);
 	printf("screen: vm_vram_size: %d MB\n", (int) (dev->vm_vram_size >> 20));
 	printf("screen: vm_gart_size: %d MB\n", (int) (dev->vm_gart_size >> 20));
 
diff --git a/tcl_init.c b/tcl_init.c
index 7729ee5..3b577ca 100644
--- a/tcl_init.c
+++ b/tcl_init.c
@@ -62,16 +62,17 @@ static void tcl_fp_color(void)
 	nouveau_bo_ref(NULL, &bo);
 }
 
+#if 0
 static void tcl_fp_nop(void)
 {
-#if 0
+/*
 000428e4  size 1, subchannel 1 (0xbeef3097),offset 0x08e4,increment
 #      NV30_TCL_PRIMITIVE_3D_ACTIVE_PROGRAM = 0x07bfef41
 # -- program at 0x0xad7e3010 - 0x20D010
 #	0x00000001 0x00000000 0x00000000 0x00000000
 #		INST 0: NOP (FL0.xxxx)  + END
 07bfef41    NV30TCL.FP_ACTIVE_PROGRAM = DMA0=TRUE | DMA1=FALSE | OFFSET=0x07bfef40
-#endif
+*/
 
 	uint32_t *map;
 	struct nouveau_bo *bo;
@@ -106,6 +107,7 @@ static void tcl_fp_nop(void)
 
 	nouveau_bo_ref(NULL, &bo);
 }
+#endif
 
 void tcl_init(void)
 {
-- 
cgit v1.2.3