diff options
| author | Tom Rini <trini@ti.com> | 2014-02-17 14:22:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-17 14:22:02 -0500 |
| commit | c4d376fd1c2bce8d64cec0431dd3f24957b6dec4 (patch) | |
| tree | de17e3a67fa4a48f3b9571bff2399cb0a24558bc /arch/arm/include/asm/arch-exynos/periph.h | |
| parent | b1ad03c242dae3712b9be66026f5d8c6f919c00b (diff) | |
| parent | 5e77a745b24d9b98aa635293972f04fd6f0c6b38 (diff) | |
| download | talos-obmc-uboot-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.tar.gz talos-obmc-uboot-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm/arch-exynos/periph.h')
| -rw-r--r-- | arch/arm/include/asm/arch-exynos/periph.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-exynos/periph.h b/arch/arm/include/asm/arch-exynos/periph.h index 30c7f18298..5c1c3d4a93 100644 --- a/arch/arm/include/asm/arch-exynos/periph.h +++ b/arch/arm/include/asm/arch-exynos/periph.h @@ -36,7 +36,6 @@ enum periph_id { PERIPH_ID_SDMMC3, PERIPH_ID_I2C8 = 87, PERIPH_ID_I2C9, - PERIPH_ID_I2C10 = 203, PERIPH_ID_I2S0 = 98, PERIPH_ID_I2S1 = 99, @@ -54,8 +53,8 @@ enum periph_id { PERIPH_ID_PWM2, PERIPH_ID_PWM3, PERIPH_ID_PWM4, + PERIPH_ID_I2C10 = 203, - PERIPH_ID_COUNT, PERIPH_ID_NONE = -1, }; |
