projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-rockchip-2015-07-13' of https://github.com/markyzq/kernel-drm-rockc...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
rockchip
/
rockchip_drm_drv.c
diff --git
a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 3962176ee71325ca4434fa34643f117c58b2d217..9a0c2911272a9062a65f10096928e73edd35dd4f 100644
(file)
--- a/
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@
-21,6
+21,7
@@
#include <drm/drm_fb_helper.h>
#include <linux/dma-mapping.h>
#include <linux/pm_runtime.h>
#include <drm/drm_fb_helper.h>
#include <linux/dma-mapping.h>
#include <linux/pm_runtime.h>
+#include <linux/module.h>
#include <linux/of_graph.h>
#include <linux/component.h>
#include <linux/of_graph.h>
#include <linux/component.h>
@@
-554,7
+555,6
@@
static struct platform_driver rockchip_drm_platform_driver = {
.probe = rockchip_drm_platform_probe,
.remove = rockchip_drm_platform_remove,
.driver = {
.probe = rockchip_drm_platform_probe,
.remove = rockchip_drm_platform_remove,
.driver = {
- .owner = THIS_MODULE,
.name = "rockchip-drm",
.of_match_table = rockchip_drm_dt_ids,
.pm = &rockchip_drm_pm_ops,
.name = "rockchip-drm",
.of_match_table = rockchip_drm_dt_ids,
.pm = &rockchip_drm_pm_ops,