git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-misc-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
bridge
/
synopsys
/
dw-hdmi.c
diff --git
a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 9a3db5234a0e06ec3492d5187ab7d1df2aa4ec6e..b23214b0c49648d87e9a7d26f23235fb36fd6209 100644
(file)
--- a/
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@
-14,7
+14,7
@@
#include <linux/irq.h>
#include <linux/module.h>
#include <linux/mutex.h>
-#include <linux/of
_device
.h>
+#include <linux/of.h>
#include <linux/pinctrl/consumer.h>
#include <linux/regmap.h>
#include <linux/dma-mapping.h>