From: Jason Cooper <jason@lakedaemon.net>
Date: Thu, 13 Jun 2013 18:02:22 +0000 (+0000)
Subject: Merge branch 'mvebu/boards' into for-next
X-Git-Tag: next-20130617~11^2~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=98e3a8eb5997b16ec67fecbdbe1db2e2af1a3589;p=karo-tx-linux.git

Merge branch 'mvebu/boards' into for-next
---

98e3a8eb5997b16ec67fecbdbe1db2e2af1a3589
diff --cc arch/arm/mach-kirkwood/board-ts219.c
index 4695d5f35fc9,10fb3974de5a..860f44ab457d
--- a/arch/arm/mach-kirkwood/board-ts219.c
+++ b/arch/arm/mach-kirkwood/board-ts219.c
@@@ -38,6 -37,14 +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);