summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-12-19 21:33:47 +1100
committerDave Airlie <airlied@linux.ie>2006-12-19 21:33:47 +1100
commitaa07b2ab0e1c8a24fb1694ca3b13eb9ea4618fbe (patch)
tree1074fb15b6e253da4542c68f30448c334df3754c /linux-core
parentff4b5ccdb4ef985c29e3f0d36e1c5094d02733e2 (diff)
downloadlibdrm-aa07b2ab0e1c8a24fb1694ca3b13eb9ea4618fbe.tar.gz
libdrm-aa07b2ab0e1c8a24fb1694ca3b13eb9ea4618fbe.tar.bz2
libdrm-aa07b2ab0e1c8a24fb1694ca3b13eb9ea4618fbe.zip
remove drm pci from 2.5 days
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_compat.h6
-rw-r--r--linux-core/drm_sysfs.c2
2 files changed, 1 insertions, 7 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index 13a2ba81..fe010ef4 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 e5dd0532..ace0778b 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);