Merge branch 'master' of git://git.denx.de/u-boot-net

diff --combined arch/arm/cpu/arm926ejs/lpc32xx/devices.c
index b0287be62f718eb03a0df60c95422234dd1e862f,9c8d65560a6157ddc6fe21647a71dcd56b10792e..c0c9c6c3122a0984e1d5bd7e5cb083f39f7efa94
--- 1/arch/arm/cpu/arm926ejs/lpc32xx/devices.c
--- 2/arch/arm/cpu/arm926ejs/lpc32xx/devices.c
+++ b/arch/arm/cpu/arm926ejs/lpc32xx/devices.c
@@@ -45,7 -45,12 +45,12 @@@ void lpc32xx_mac_init(void
  {
        /* Enable MAC interface */
        writel(CLK_MAC_REG | CLK_MAC_SLAVE | CLK_MAC_MASTER
-               | CLK_MAC_MII, &clk->macclk_ctrl);
+ #if defined(CONFIG_RMII)
+               | CLK_MAC_RMII,
+ #else
+               | CLK_MAC_MII,
+ #endif
+               &clk->macclk_ctrl);
  }
  
  void lpc32xx_mlc_nand_init(void)
@@@ -54,12 -59,6 +59,12 @@@
        writel(CLK_NAND_MLC | CLK_NAND_MLC_INT, &clk->flashclk_ctrl);
  }
  
 +void lpc32xx_slc_nand_init(void)
 +{
 +      /* Enable SLC NAND interface */
 +      writel(CLK_NAND_SLC | CLK_NAND_SLC_SELECT, &clk->flashclk_ctrl);
 +}
 +
  void lpc32xx_i2c_init(unsigned int devnum)
  {
        /* Enable I2C interface */