Fix up DRI CVS merge of sis driver with CONFIG_FB_SIS

diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
index 5b4ea1d05220fb9a25aae3588c4286b3327f5e1b..80935d6a7396ed7d17f1d6e6667ad0c051ce2255 100644 (file)
--- 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;
 }