diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-05-19 13:55:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-05-19 13:55:43 +0200 |
| commit | 764fdbaba337e3b58f31ce7b177c4e7c0ba2088d (patch) | |
| tree | 954b7c40be6beb5ab6ca9158840e93873cc43427 /drivers/video | |
| parent | 28889ccbfe785c59bfaa7c39985c376b697e2331 (diff) | |
| parent | 747146a3eb186fb7101f1aaab53d9188dc41bfbb (diff) | |
| download | barebox-764fdbaba337e3b58f31ce7b177c4e7c0ba2088d.tar.gz barebox-764fdbaba337e3b58f31ce7b177c4e7c0ba2088d.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/omap.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index dcdc6c2135..a20b7bbee9 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -75,7 +75,7 @@ config DRIVER_VIDEO_S3C24XX config DRIVER_VIDEO_OMAP bool "OMAP framebuffer driver" - depends on ARCH_OMAP4 + depends on ARCH_OMAP4 || COMPILE_TEST help Add support for OMAP Display Controller. Currently this driver only supports OMAP4 SoCs in DISPC parallel mode on diff --git a/drivers/video/omap.c b/drivers/video/omap.c index 62c51a1dfc..ca41ab36fc 100644 --- a/drivers/video/omap.c +++ b/drivers/video/omap.c @@ -20,8 +20,7 @@ #include <clock.h> #include <linux/err.h> -#include <mach/omap4-silicon.h> -#include <mach/omap-fb.h> +#include <video/omap-fb.h> #include <mmu.h> |