Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae6f4a8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents a5fcaa21 45ea5dcd

drivers/char/drm/drm_stub.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

drivers/char/drm/sis_mm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;