Fix up DRI CVS merge of sis driver with CONFIG_FB_SIS

5200249b · Linus Torvalds · c9c9f146 · 5200249b
Commit 5200249b authored Sep 25, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/char/drm/sis_mm.c drivers/char/drm/sis_mm.c +2 -2

No files found.
--- a/drivers/char/drm/sis_mm.c
+++ b/drivers/char/drm/sis_mm.c
@@ -34,7 +34,7 @@
 #include "sis_drv.h"
 #include "sis_ds.h"
 #if defined(__linux__) && defined(CONFIG_FB_SIS)
-#include <linux/sisfb.h>
+#include <video/sisfb.h>
 #endif
 #define MAX_CONTEXT 100
@@ -132,7 +132,7 @@ int sis_fb_free( DRM_IOCTL_ARGS )
 		retval = DRM_ERR(EINVAL);
 	sis_free(fb.free);
-	DRM_DEBUG("free fb, offset = %d\n", fb.free);
+	DRM_DEBUG("free fb, offset = %lu\n", fb.free);
 	return retval;
 }