diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-07-26 16:58:28 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-07-26 16:58:28 -0700 |
| commit | c561cb4650dc5895acfb3ae00c7ff455be31a860 (patch) | |
| tree | 65b21097253d216e0385778597031ae288e34023 /linux-core/drm_sysfs.c | |
| parent | 2bafeb673f14b1e3799bf00817138c0b8211635e (diff) | |
| parent | 4175dd818110bd10d6d09190d30c271e89202b18 (diff) | |
Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2
Conflicts:
linux-core/drmP.h
linux-core/drm_scatter.c
Diffstat (limited to 'linux-core/drm_sysfs.c')
| -rw-r--r-- | linux-core/drm_sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_sysfs.c b/linux-core/drm_sysfs.c index 9b2f5dce..1090e719 100644 --- a/linux-core/drm_sysfs.c +++ b/linux-core/drm_sysfs.c @@ -123,7 +123,7 @@ void drm_sysfs_destroy(struct drm_sysfs_class *cs) static ssize_t show_dri(struct class_device *class_device, char *buf) { - drm_device_t * dev = ((drm_head_t *)class_get_devdata(class_device))->dev; + struct drm_device * dev = ((struct drm_head *)class_get_devdata(class_device))->dev; if (dev->driver->dri_library_name) return dev->driver->dri_library_name(dev, buf); return snprintf(buf, PAGE_SIZE, "%s\n", dev->driver->pci_driver.name); @@ -148,7 +148,7 @@ static struct class_device_attribute class_device_attrs[] = { * created with a call to drm_sysfs_create(). */ struct class_device *drm_sysfs_device_add(struct drm_sysfs_class *cs, - drm_head_t * head) + struct drm_head * head) { struct simple_dev *s_dev = NULL; int i, retval; |