diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-14 11:23:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-14 11:23:05 -0500 |
| commit | f46c25583a73042edf432b209ee4b93bc3f7e762 (patch) | |
| tree | a7cbd8afde1b0cbf86a9c8150cbd737df3ee82c9 /drivers/i2c | |
| parent | db18f548cb7b5ff99223b66eac1966eb45230817 (diff) | |
| parent | f822d8578ba395d9af1cc315a2fb87b1eed3d355 (diff) | |
Merge git://www.denx.de/git/u-boot-marvell
Conflicts:
arch/arm/Kconfig
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/mvtwsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index f20d1b2291..5dc4fbba1f 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -20,7 +20,7 @@ #if defined(CONFIG_ORION5X) #include <asm/arch/orion5x.h> -#elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARMADA_XP)) +#elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU)) #include <asm/arch/soc.h> #elif defined(CONFIG_SUNXI) #include <asm/arch/i2c.h> |