lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm: merge Linux master into HEAD

Browse Source 
Conflicts:
	drivers/gpu/drm/drm_info.c
	drivers/gpu/drm/drm_proc.c
	drivers/gpu/drm/i915/i915_gem_debugfs.c
This commit is contained in:
Dave Airlie
2009-03-28 20:22:18 -04:00
parent 41f13fe81d 07d43ba986
commit 90f959bcb3
4618 changed files with 335689 additions and 181969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/drm_sysfs.c
View File

@@ -349,8 +349,8 @@ int drm_sysfs_connector_add(struct drm_connector *connector)
DRM_DEBUG("adding \"%s\" to sysfs\n",
drm_get_connector_name(connector));
snprintf(connector->kdev.bus_id, BUS_ID_SIZE, "card%d-%s",
dev->primary->index, drm_get_connector_name(connector));
dev_set_name(&connector->kdev, "card%d-%s",
dev->primary->index, drm_get_connector_name(connector));
ret = device_register(&connector->kdev);
if (ret) {