diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2007-01-07 22:37:40 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2007-01-07 22:37:40 -0800 |
| commit | c5aaf7648df82665851c9e67f5509b427ca34c8e (patch) | |
| tree | 55b317738a99097cb02ba6a736b9ef20de6b34f3 /linux-core/drm_sysfs.c | |
| parent | 63c0f3946056d044b7c5688fa5cb670782212c77 (diff) | |
| parent | d0080d71b9f3df0d4f743324b7e8f1ce580bdcaf (diff) | |
Merge branch 'master' into crestline
Conflicts:
shared-core/i915_drm.h
Whitespace change only
Diffstat (limited to 'linux-core/drm_sysfs.c')
| -rw-r--r-- | linux-core/drm_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |