diff options
| author | Tom Rini | 2015-08-06 19:56:03 -0400 |
|---|---|---|
| committer | Tom Rini | 2015-08-06 19:56:03 -0400 |
| commit | ae27120c31d58b8bb694d9155bcffdcfae8552a6 (patch) | |
| tree | 8fcd4823406dc3adfb82174314198e9396c24feb /arch/arm/include | |
| parent | f05fa6781ae1122f348e66b5b26acbfe552f6602 (diff) | |
| parent | fac971b2b5efbdb6ed2d12ebdbf7e029c5ed30e8 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-exynos/dp_info.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-exynos/periph.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-exynos/dp_info.h b/arch/arm/include/asm/arch-exynos/dp_info.h index 3f6750a6b2b..17e8f56d904 100644 --- a/arch/arm/include/asm/arch-exynos/dp_info.h +++ b/arch/arm/include/asm/arch-exynos/dp_info.h @@ -197,6 +197,4 @@ unsigned int exynos_init_dp(void) } #endif -void exynos_set_dp_platform_data(struct exynos_dp_platform_data *pd); - #endif /* _DP_INFO_H */ diff --git a/arch/arm/include/asm/arch-exynos/periph.h b/arch/arm/include/asm/arch-exynos/periph.h index 5c1c3d4a93c..fdc9e87c691 100644 --- a/arch/arm/include/asm/arch-exynos/periph.h +++ b/arch/arm/include/asm/arch-exynos/periph.h @@ -53,6 +53,7 @@ enum periph_id { PERIPH_ID_PWM2, PERIPH_ID_PWM3, PERIPH_ID_PWM4, + PERIPH_ID_DPHPD, PERIPH_ID_I2C10 = 203, PERIPH_ID_NONE = -1, |