diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-01-13 20:13:26 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-01-13 20:13:26 +0100 |
| commit | d877bc099e3a37ac13cfdf20139c1ffcac5c9ac4 (patch) | |
| tree | 6f772cb1521c6a1974dcb405008a6263943a2818 /include | |
| parent | f563db33c1085bf7d616b98cac62337beb65b0a2 (diff) | |
| parent | f5bc38aba82a3cd96ee5ddbae3047f1caa31ed3c (diff) | |
| download | talos-obmc-uboot-d877bc099e3a37ac13cfdf20139c1ffcac5c9ac4.tar.gz talos-obmc-uboot-d877bc099e3a37ac13cfdf20139c1ffcac5c9ac4.zip | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians:
fix: error ATMEL_FIO_BASE undeclared, if use I2C_Soft on AT91
Diffstat (limited to 'include')
| -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 ee31034c7a..1f35acf675 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -78,7 +78,7 @@ # elif (defined(CONFIG_AT91RM9200) || \ defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9261) || \ defined(CONFIG_AT91SAM9263)) && !defined(CONFIG_AT91_LEGACY) -# define I2C_SOFT_DECLARATIONS at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE; +# define I2C_SOFT_DECLARATIONS at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIOA; # else # define I2C_SOFT_DECLARATIONS # endif |
