From: Dave Airlie Date: Tue, 19 Dec 2006 10:33:47 +0000 (+1100) Subject: remove drm pci from 2.5 days X-Git-Tag: libdrm-2.3.1~466 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa07b2ab0e1c8a24fb1694ca3b13eb9ea4618fbe;p=platform%2Fupstream%2Flibdrm.git remove drm pci from 2.5 days --- diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h index 13a2ba8..fe010ef 100644 --- a/linux-core/drm_compat.h +++ b/linux-core/drm_compat.h @@ -86,12 +86,6 @@ pos = n, n = list_entry(n->member.next, typeof(*n), member)) #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -#define DRM_PCI_DEV(pdev) &pdev->dev -#else -#define DRM_PCI_DEV(pdev) NULL -#endif - #ifndef __user #define __user #endif diff --git a/linux-core/drm_sysfs.c b/linux-core/drm_sysfs.c index e5dd053..ace0778 100644 --- a/linux-core/drm_sysfs.c +++ b/linux-core/drm_sysfs.c @@ -162,7 +162,7 @@ struct class_device *drm_sysfs_device_add(struct drm_sysfs_class *cs, memset(s_dev, 0x00, sizeof(*s_dev)); s_dev->dev = MKDEV(DRM_MAJOR, head->minor); - s_dev->class_dev.dev = DRM_PCI_DEV(head->dev->pdev); + s_dev->class_dev.dev = &head->dev->pdev->dev; s_dev->class_dev.class = &cs->class; snprintf(s_dev->class_dev.class_id, BUS_ID_SIZE, "card%d", head->minor);