diff options
author | Tom Rini | 2024-05-20 13:35:03 -0600 |
---|---|---|
committer | Tom Rini | 2024-05-20 13:35:03 -0600 |
commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /drivers/video/imx | |
parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/video/imx')
-rw-r--r-- | drivers/video/imx/ipu_common.c | 2 | ||||
-rw-r--r-- | drivers/video/imx/ipu_disp.c | 1 | ||||
-rw-r--r-- | drivers/video/imx/mxc_ipuv3_fb.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/imx/ipu_common.c b/drivers/video/imx/ipu_common.c index b0a99c9cd5d..d582fb8ad9d 100644 --- a/drivers/video/imx/ipu_common.c +++ b/drivers/video/imx/ipu_common.c @@ -11,7 +11,7 @@ */ /* #define DEBUG */ -#include <common.h> +#include <config.h> #include <log.h> #include <linux/delay.h> #include <linux/types.h> diff --git a/drivers/video/imx/ipu_disp.c b/drivers/video/imx/ipu_disp.c index 144322e4e26..aaba7d135a4 100644 --- a/drivers/video/imx/ipu_disp.c +++ b/drivers/video/imx/ipu_disp.c @@ -12,7 +12,6 @@ /* #define DEBUG */ -#include <common.h> #include <log.h> #include <linux/delay.h> #include <linux/types.h> diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index 7e60385bcfa..039b22086a9 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -10,7 +10,6 @@ * (C) Copyright 2004-2010 Freescale Semiconductor, Inc. */ -#include <common.h> #include <log.h> #include <part.h> #include <asm/cache.h> |