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

* 'master' of git://git.denx.de/u-boot-nios:
  nios2: Offer ft_board_setup() capability and call fdt_fixup_ethernet().
  board/nios2-generic: Use altera_pio driver and remove board specific driver
  gpio: Add driver for Altera's PIO core
  nios2: Pseudo implement dcache_status/enable/disable()

diff --combined drivers/gpio/Makefile
index e1142d14be4810340e73666800d5b1cfc79443d1,b5264d1da5638f653c5e48e1ead3e24ccf88a141..e22c09689de6bea9af2e5c322d7fb0466c8aadfb
--- 1/drivers/gpio/Makefile
--- 2/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -30,12 -30,12 +30,13 @@@ COBJS-$(CONFIG_KIRKWOOD_GPIO)      += kw_gpi
  COBJS-$(CONFIG_MARVELL_GPIO)  += mvgpio.o
  COBJS-$(CONFIG_MARVELL_MFP)   += mvmfp.o
  COBJS-$(CONFIG_MXC_GPIO)      += mxc_gpio.o
 +COBJS-$(CONFIG_MXS_GPIO)      += mxs_gpio.o
  COBJS-$(CONFIG_PCA953X)               += pca953x.o
  COBJS-$(CONFIG_PCA9698)               += pca9698.o
  COBJS-$(CONFIG_S5P)           += s5p_gpio.o
  COBJS-$(CONFIG_TEGRA2_GPIO)   += tegra2_gpio.o
  COBJS-$(CONFIG_DA8XX_GPIO)    += da8xx_gpio.o
+ COBJS-$(CONFIG_ALTERA_PIO)    += altera_pio.o
  
  COBJS := $(COBJS-y)
  SRCS  := $(COBJS:.o=.c)