diff options
author | Dave Airlie <airlied@redhat.com> | 2010-07-07 04:37:35 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-07-07 04:37:35 -0400 |
commit | db8cc27b804f89e8fd5f9d5385161956a777c471 (patch) | |
tree | 4d84e12dbf9b4bd75fa6150f4aedf54a41d722db /drivers/gpu/drm/drm_sysfs.c | |
parent | 6dbe7465713f0e45f0e867105ca944978d57346e (diff) | |
parent | 05269a3a5a78bb074413de495105d7a2686c4529 (diff) |
Merge branch 'drm-platform' into drm-testing
* drm-platform:
drm: Make sure the DRM offset matches the CPU
drm: Add __arm defines to DRM
drm: Add support for platform devices to register as DRM devices
drm: Remove drm_resource wrappers
Diffstat (limited to 'drivers/gpu/drm/drm_sysfs.c')
-rw-r--r-- | drivers/gpu/drm/drm_sysfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 101d381e9d86..86118a742231 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c | |||
@@ -489,7 +489,8 @@ int drm_sysfs_device_add(struct drm_minor *minor) | |||
489 | int err; | 489 | int err; |
490 | char *minor_str; | 490 | char *minor_str; |
491 | 491 | ||
492 | minor->kdev.parent = &minor->dev->pdev->dev; | 492 | minor->kdev.parent = minor->dev->dev; |
493 | |||
493 | minor->kdev.class = drm_class; | 494 | minor->kdev.class = drm_class; |
494 | minor->kdev.release = drm_sysfs_device_release; | 495 | minor->kdev.release = drm_sysfs_device_release; |
495 | minor->kdev.devt = minor->device; | 496 | minor->kdev.devt = minor->device; |