Merge branch 'tracking-armlt-arm64' into integration-linux-vexpresstracking-integration-linux-vexpress-lsk-20130505.0

Conflicts:
	drivers/clk/versatile/Makefile

1 files changed, 0 insertions, 3 deletions

diff --git a/include/linux/vexpress.h b/include/linux/vexpress.h
index 81fa998e7ad..8fa1957b87e 100644
--- a/include/linux/vexpress.h
+++ b/include/linux/vexpress.h
@@ -116,9 +116,6 @@ unsigned __vexpress_get_site(struct device *dev, struct device_node *node);
 void vexpress_sysreg_early_init(void __iomem *base);
 void vexpress_sysreg_of_early_init(void);
 
-void vexpress_power_off(void);
-void vexpress_restart(char str, const char *cmd);
-
 /* Clocks */
 
 struct clk *vexpress_osc_setup(struct device *dev);