diff options
| author | Tom Rini <trini@ti.com> | 2013-12-10 17:15:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-10 17:15:18 -0500 |
| commit | 4b210ad34282bfd9fc982a8e3c9a9126f4094cdb (patch) | |
| tree | f91ebdc46ede952728602d5ecc18e64ad0e52682 /include/i2c.h | |
| parent | 65b7fe28a12bbaccc7a0c076f5f9f213150030e7 (diff) | |
| parent | f15ea6e1d67782a1626d4a4922b6c20e380085e5 (diff) | |
| download | olio-uboot-2014.01-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.tar.xz olio-uboot-2014.01-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
board/samsung/trats2/trats2.c
include/configs/exynos5250-dt.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/i2c.h')
| -rw-r--r-- | include/i2c.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/i2c.h b/include/i2c.h index c1be533d5..f93a18366 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -147,7 +147,7 @@ extern struct i2c_bus_hose i2c_bus[]; # elif (defined(CONFIG_AT91RM9200) || \ defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9261) || \ - defined(CONFIG_AT91SAM9263)) && !defined(CONFIG_AT91_LEGACY) + defined(CONFIG_AT91SAM9263)) # define I2C_SOFT_DECLARATIONS at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIOA; # else # define I2C_SOFT_DECLARATIONS |