diff options
| author | danh-arm <dan.handley@arm.com> | 2016-02-19 18:22:08 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2016-02-19 18:22:08 +0000 |
| commit | 6f8016b87eb99d64bb75ecd0a443622eb7c6d681 (patch) | |
| tree | beacaaf6293c4dcc2846091350b84661c8aab287 | |
| parent | f62d89ed866d26beb96a6ddff1cbd80e9f51760c (diff) | |
| parent | e0ea0928d5b7779cd9c3dfb1aec4879ae35c0625 (diff) | |
Merge pull request #525 from antonio-nino-diaz-arm/an/fix-gpio-includes
Fix gpio includes of mt8173 platform to avoid collision.
| -rw-r--r-- | plat/mediatek/mt8173/drivers/gpio/gpio.c | 2 | ||||
| -rw-r--r-- | plat/mediatek/mt8173/plat_pm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plat/mediatek/mt8173/drivers/gpio/gpio.c b/plat/mediatek/mt8173/drivers/gpio/gpio.c index 20473b91..f19c9315 100644 --- a/plat/mediatek/mt8173/drivers/gpio/gpio.c +++ b/plat/mediatek/mt8173/drivers/gpio/gpio.c @@ -28,10 +28,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <debug.h> -#include <gpio.h> #include <mmio.h> #include <mt8173_def.h> #include <pmic_wrap_init.h> +#include "gpio.h" enum { MAX_GPIO_REG_BITS = 16, diff --git a/plat/mediatek/mt8173/plat_pm.c b/plat/mediatek/mt8173/plat_pm.c index f28f8edc..be33c911 100644 --- a/plat/mediatek/mt8173/plat_pm.c +++ b/plat/mediatek/mt8173/plat_pm.c @@ -36,7 +36,6 @@ #include <console.h> #include <debug.h> #include <errno.h> -#include <gpio.h> #include <mcucfg.h> #include <mmio.h> #include <mt8173_def.h> @@ -49,6 +48,7 @@ #include <spm_hotplug.h> #include <spm_mcdi.h> #include <spm_suspend.h> +#include "drivers/gpio/gpio.h" struct core_context { unsigned long timer_data[8]; |