Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[deliverable/linux.git] / drivers / gpu / drm / drm_platform.c

diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
index 0c09ddd50c1577769b9385a598fcce5d302f6459..5314c9d5fef473daeb14677f08497780e87ef987 100644 (file)
--- a/drivers/gpu/drm/drm_platform.c
+++ b/drivers/gpu/drm/drm_platform.c
@@ -68,7 +68,7 @@ err_free:
        return ret;
 }
 
-static int drm_platform_set_busid(struct drm_device *dev, struct drm_master *master)
+int drm_platform_set_busid(struct drm_device *dev, struct drm_master *master)
 {
        int id;
 
@@ -82,13 +82,9 @@ static int drm_platform_set_busid(struct drm_device *dev, struct drm_master *mas
                return -ENOMEM;
 
        master->unique_len = strlen(master->unique);
-       master->unique_size = master->unique_len;
        return 0;
 }
-
-static struct drm_bus drm_platform_bus = {
-       .set_busid = drm_platform_set_busid,
-};
+EXPORT_SYMBOL(drm_platform_set_busid);
 
 /**
  * drm_platform_init - Register a platform device with the DRM subsystem
@@ -105,7 +101,6 @@ int drm_platform_init(struct drm_driver *driver, struct platform_device *platfor
 {
        DRM_DEBUG("\n");
 
-       driver->bus = &drm_platform_bus;
        return drm_get_platform_dev(platform_device, driver);
 }
 EXPORT_SYMBOL(drm_platform_init);