diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-09 14:40:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-09 14:40:16 -0800 |
| commit | 58fcba61dea4a238f907bf7eb8b9c95427c27f28 (patch) | |
| tree | 0ec863b5e9440d8eb474c6a510a552048f7f5fd1 | |
| parent | Merge tag 'for-linus-4.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip (diff) | |
| parent | video: omapfb: fix missing #includes (diff) | |
| download | linux-dev-58fcba61dea4a238f907bf7eb8b9c95427c27f28.tar.xz linux-dev-58fcba61dea4a238f907bf7eb8b9c95427c27f28.zip | |
Merge tag 'fbdev-v4.16-fix' of git://github.com/bzolnier/linux
Pull fbdev fix from Bartlomiej Zolnierkiewicz:
"Fix building of the omapfb driver (Tomi Valkeinen)"
* tag 'fbdev-v4.16-fix' of git://github.com/bzolnier/linux:
video: omapfb: fix missing #includes
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/dss.c | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 1 | ||||
| -rw-r--r-- | drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c | 2 |
4 files changed, 6 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c index 39fe7247ff98..f0cac9e0eb94 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c @@ -40,6 +40,7 @@ #include <linux/regulator/consumer.h> #include <linux/suspend.h> #include <linux/component.h> +#include <linux/pinctrl/consumer.h> #include <video/omapfb_dss.h> diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c index eee09b4bdcf6..11dbc05d5720 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c @@ -13,6 +13,8 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/seq_file.h> + #include <video/omapfb_dss.h> #include "dss.h" diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c index eac3665aba6c..bc591fc12aef 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c @@ -16,6 +16,7 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/clk.h> +#include <linux/seq_file.h> #include <video/omapfb_dss.h> diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c index 705373e4cf38..4af6ba220744 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c @@ -14,6 +14,8 @@ #include <linux/err.h> #include <linux/io.h> #include <linux/platform_device.h> +#include <linux/seq_file.h> + #include <video/omapfb_dss.h> #include "dss.h" |