diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-07-01 19:08:22 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-07-01 19:08:22 +0100 |
| commit | 89815f11b50befdcff19dc8cb862549ea057715e (patch) | |
| tree | a8df3d889b716b9c3389bae2ceeaa931906851a9 /drivers/mfd/glamo/glamo-drm-drv.c | |
| parent | 11954ff1745ec10e01db1d9b1e2037a5eea848ce (diff) | |
Compatibility glamo-drm <---> glamo-fb
Signed-off-by: Thomas White <taw@bitwiz.org.uk>
Diffstat (limited to 'drivers/mfd/glamo/glamo-drm-drv.c')
| -rw-r--r-- | drivers/mfd/glamo/glamo-drm-drv.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c index 2421f104035..97d058f57d6 100644 --- a/drivers/mfd/glamo/glamo-drm-drv.c +++ b/drivers/mfd/glamo/glamo-drm-drv.c @@ -26,6 +26,7 @@ #include <linux/platform_device.h> #include <drm/drmP.h> #include <drm/glamo_drm.h> +#include <linux/glamofb.h> #include "glamo-core.h" #include "glamo-cmdq.h" @@ -198,6 +199,7 @@ static int glamodrm_probe(struct platform_device *pdev) { int rc; struct glamodrm_handle *gdrm; + struct glamofb_platform_data *mach_info; printk(KERN_CRIT "[glamo-drm] SMedia Glamo Direct Rendering Support\n"); @@ -205,7 +207,8 @@ static int glamodrm_probe(struct platform_device *pdev) if ( !gdrm ) return -ENOMEM; platform_set_drvdata(pdev, gdrm); - gdrm->glamo_core = pdev->dev.platform_data; + mach_info = pdev->dev.platform_data; + gdrm->glamo_core = mach_info->glamo; gdrm->dev = &pdev->dev; /* Find the command queue registers */ @@ -370,7 +373,7 @@ static struct platform_driver glamodrm_driver = { .suspend = glamodrm_suspend, .resume = glamodrm_resume, .driver = { - .name = "glamo-graphics", + .name = "glamo-fb", .owner = THIS_MODULE, }, }; |