From cca5307d178c931e70a642302b56fa2701d02253 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 17 Jul 2007 12:55:58 +1000 Subject: drm: fix problem with SiS typedef with sisfb enabled. Reported by: Avuton Olrich Signed-off-by: Dave Airlie --- drivers/char/drm/sis_mm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c index 0580fa33cb7..441bbdbf151 100644 --- a/drivers/char/drm/sis_mm.c +++ b/drivers/char/drm/sis_mm.c @@ -94,7 +94,7 @@ static int sis_fb_init(DRM_IOCTL_ARGS) mutex_lock(&dev->struct_mutex); #if defined(CONFIG_FB_SIS) { - drm_sman_mm_t sman_mm; + struct drm_sman_mm sman_mm; sman_mm.private = (void *)0xFFFFFFFF; sman_mm.allocate = sis_sman_mm_allocate; sman_mm.free = sis_sman_mm_free; -- cgit v1.2.3 From 45ea5dcde62db8eccc8503defae3c3353256975d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 17 Jul 2007 14:20:07 +1000 Subject: drm: add idr_init to drm_stub.c Brown paper bag for me this patch chunk didn't make it in the first application Signed-off-by: Dave Airlie --- drivers/char/drm/drm_stub.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c index 9138b49e676..ee83ff9efed 100644 --- a/drivers/char/drm/drm_stub.c +++ b/drivers/char/drm/drm_stub.c @@ -72,6 +72,8 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, mutex_init(&dev->struct_mutex); mutex_init(&dev->ctxlist_mutex); + idr_init(&dev->drw_idr); + dev->pdev = pdev; dev->pci_device = pdev->device; dev->pci_vendor = pdev->vendor; -- cgit v1.2.3