aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@canonical.com>2011-05-06 00:46:01 -0300
committerRicardo Salveti de Araujo <ricardo.salveti@canonical.com>2011-05-16 22:53:07 -0300
commitfafe2ba1bc4774af081272cbf267a7010e6dbf49 (patch)
tree8431632976071b565aed5b99fb4c887d165c2faa /drivers
parent6b2ea2506df17fd25443a3fc45218541c7eafad5 (diff)
downloadlinux-linaro-android-fafe2ba1bc4774af081272cbf267a7010e6dbf49.tar.gz
DRM: OMAP: Fixing PVR kernel module name
We currently expect it to be "pvrsrvkm" and not "omap_gpu_pvr", so change it to load the correct driver. Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/omap/omap_gpu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omap/omap_gpu.c b/drivers/gpu/drm/omap/omap_gpu.c
index b94a9e38365..40fe9cbce9b 100644
--- a/drivers/gpu/drm/omap/omap_gpu.c
+++ b/drivers/gpu/drm/omap/omap_gpu.c
@@ -24,6 +24,7 @@
#include "drm_fb_helper.h"
#define DRIVER_NAME MODULE_NAME
+#define PVR_DRIVER_NAME "pvrsrvkm"
#define DRIVER_DESC "OMAP GPU"
#define DRIVER_DATE "20110403"
#define DRIVER_MAJOR 1
@@ -449,7 +450,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(DRIVER_NAME "_pvr", plugin->name)) {
+ if (!strcmp(PVR_DRIVER_NAME, plugin->name)) {
found_pvr = true;
break;
}
@@ -457,7 +458,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(DRIVER_NAME "_pvr");
+ request_module(PVR_DRIVER_NAME);
}
list_for_each_entry(plugin, &plugin_list, list) {