diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-10-17 02:06:57 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-10-17 02:06:57 -0600 |
| commit | 64280ee0437965b91174d0398e4148867f48ee27 (patch) | |
| tree | 671315b82e1ff25eac88ce37f0817c6dc7becc47 | |
| parent | 7a270c460fcb03d3aa681473d94726b0e1420f01 (diff) | |
Revert "DRM: OMAP: Fixing PVR kernel module name"
This reverts commit 0d084f1bebb88a2fb665dce57fbf40b8631de66e.
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 | ||||
| -rw-r--r-- | drivers/staging/omapdrm/omap_drv.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 3141170d194..87b695b807f 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -729,7 +729,7 @@ static void omap_init_gpu(void) char oh_name[max_omap_drm_hwmod_name_len]; int l; struct gpu_platform_data *pdata; - char *name = "pvrsrvkm"; + char *name = "omapdrm_pvr"; l = snprintf(oh_name, max_omap_drm_hwmod_name_len, "gpu"); diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c index 93810cabac0..b569ae121da 100644 --- a/drivers/staging/omapdrm/omap_drv.c +++ b/drivers/staging/omapdrm/omap_drv.c @@ -24,7 +24,6 @@ #include "drm_fb_helper.h" #define DRIVER_NAME MODULE_NAME -#define PVR_DRIVER_NAME "pvrsrvkm" #define DRIVER_DESC "OMAP DRM" #define DRIVER_DATE "20110403" #define DRIVER_MAJOR 1 @@ -458,7 +457,7 @@ static int dev_open(struct drm_device *dev, struct drm_file *file) DBG("open: dev=%p, file=%p", dev, file); list_for_each_entry(plugin, &plugin_list, list) { - if (!strcmp(PVR_DRIVER_NAME, plugin->name)) { + if (!strcmp(DRIVER_NAME "_pvr", plugin->name)) { found_pvr = true; break; } @@ -466,7 +465,7 @@ static int dev_open(struct drm_device *dev, struct drm_file *file) if (!found_pvr) { DBG("open: PVR submodule not loaded.. let's try now"); - request_module(PVR_DRIVER_NAME); + request_module(DRIVER_NAME "_pvr"); } list_for_each_entry(plugin, &plugin_list, list) { |