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

diff --git a/include/i2c.h b/include/i2c.h
index ee31034c7aa2236a919d2171fe127fd0bac92097..1f35acf67595105b5888d2f516bd4647c97cdf07 100644 (file)
--- 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