summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/via_drv.c10
-rw-r--r--shared-core/via_drv.h10
-rw-r--r--shared-core/via_map.c1
-rw-r--r--shared-core/via_mm.c4
4 files changed, 12 insertions, 13 deletions
diff --git a/shared-core/via_drv.c b/shared-core/via_drv.c
index 4ec0124c..68459830 100644
--- a/shared-core/via_drv.c
+++ b/shared-core/via_drv.c
@@ -27,16 +27,6 @@
#include "via_drm.h"
#include "via_drv.h"
-#define DRIVER_AUTHOR "VIA"
-
-#define DRIVER_NAME "via"
-#define DRIVER_DESC "VIA Unichrome"
-#define DRIVER_DATE "20041010"
-
-#define DRIVER_MAJOR 2
-#define DRIVER_MINOR 0
-#define DRIVER_PATCHLEVEL 0
-
#include "drm_pciids.h"
static int postinit(struct drm_device *dev, unsigned long flags)
diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h
index 07db9727..28556853 100644
--- a/shared-core/via_drv.h
+++ b/shared-core/via_drv.h
@@ -24,7 +24,15 @@
#ifndef _VIA_DRV_H_
#define _VIA_DRV_H_
-#include "via_drm.h"
+#define DRIVER_AUTHOR "VIA"
+
+#define DRIVER_NAME "via"
+#define DRIVER_DESC "VIA Unichrome"
+#define DRIVER_DATE "20041010"
+
+#define DRIVER_MAJOR 2
+#define DRIVER_MINOR 0
+#define DRIVER_PATCHLEVEL 0
typedef struct drm_via_ring_buffer {
drm_map_t map;
diff --git a/shared-core/via_map.c b/shared-core/via_map.c
index 84b818b0..dcf714db 100644
--- a/shared-core/via_map.c
+++ b/shared-core/via_map.c
@@ -22,6 +22,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include "drmP.h"
+#include "via_drm.h"
#include "via_drv.h"
int via_do_init_map(drm_device_t * dev, drm_via_init_t * init)
diff --git a/shared-core/via_mm.c b/shared-core/via_mm.c
index 169ad26e..985ad0d9 100644
--- a/shared-core/via_mm.c
+++ b/shared-core/via_mm.c
@@ -77,7 +77,7 @@ int via_agp_init(DRM_IOCTL_ARGS)
AgpHeap = via_mmInit(agp.offset, agp.size);
- DRM_DEBUG("offset = %lu, size = %lu", agp.offset, agp.size);
+ DRM_DEBUG("offset = %lu, size = %lu", (unsigned long)agp.offset, (unsigned long)agp.size);
return 0;
}
@@ -93,7 +93,7 @@ int via_fb_init(DRM_IOCTL_ARGS)
FBHeap = via_mmInit(fb.offset, fb.size);
- DRM_DEBUG("offset = %lu, size = %lu", fb.offset, fb.size);
+ DRM_DEBUG("offset = %lu, size = %lu", (unsigned long)fb.offset, (unsigned long)fb.size);
return 0;
}