Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlie...

* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: add idr_init to drm_stub.c
  drm: fix problem with SiS typedef with sisfb enabled.

diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
index 9138b49..ee83ff9 100644 (file)
--- 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;

diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
index 0580fa3..441bbdb 100644 (file)
--- 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;