diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 08:44:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 08:44:27 -0700 |
| commit | ae6f4a8b986c9d9eff00fcbd23d1c2585b97fe57 (patch) | |
| tree | f9a8b8a226cf1f30cb37966482ab64bd4e5161bd | |
| parent | a5fcaa210626a79465321e344c91a6a7dc3881fa (diff) | |
| parent | 45ea5dcde62db8eccc8503defae3c3353256975d (diff) | |
| download | linux-ae6f4a8b986c9d9eff00fcbd23d1c2585b97fe57.tar.gz | |
Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* '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.
| -rw-r--r-- | drivers/char/drm/drm_stub.c | 2 | ||||
| -rw-r--r-- | drivers/char/drm/sis_mm.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c index 9138b49e676e..ee83ff9efed6 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; diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c index 0580fa33cb77..441bbdbf1510 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; |