Merge tag 'omap-for-v3.11/board-signed' of git://git.kernel.org/pub/scm/linux/kernel...

From Tony Lindgren:

Minor board changes for v3.11 merge window. These are
tapering down finally as we're getting closer to making
omap2+ DT only.

* tag 'omap-for-v3.11/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV
  ARM: OMAP1: nokia770: enable Tahvo
  ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN
  arm: omap: board-overo: reset GPIO for SMSC911x

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/mach-kirkwood/board-ts219.c
index 10fb397,4695d5f..860f44a
--- 1/arch/arm/mach-kirkwood/board-ts219.c
--- 2/arch/arm/mach-kirkwood/board-ts219.c
+++ b/arch/arm/mach-kirkwood/board-ts219.c
@@@ -37,14 -38,6 +37,4 @@@ void __init qnap_dt_ts219_init(void
                qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
  
        kirkwood_ge00_init(&qnap_ts219_ge00_data);
 -
 -      pm_power_off = qnap_tsx1x_power_off;
  }
- 
- /* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
- static int __init ts219_pci_init(void)
- {
-       if (machine_is_ts219())
-               kirkwood_pcie_init(KW_PCIE0);
- 
-       return 0;
- }
- subsys_initcall(ts219_pci_init);

diff --cc arch/arm/mach-ux500/board-mop500-regulators.c
Simple merge