diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-04-16 14:15:27 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-04-16 14:15:27 +0100 |
| commit | 7e1cb9f7bfc9b36b967110eac1756bfe75aaef1c (patch) | |
| tree | 42a4585c30b5a1b6623602168f06d147564f9b36 /include/linux/vexpress.h | |
| parent | 0b7db8e5dd635eeef30368d8bf0ebcea5303da1b (diff) | |
| parent | 19066c86539c4f7966ae82a89588cb5ccb692a0b (diff) | |
Merge branch 'tracking-armlt-arm64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20130417.0tracking-integration-linaro-vexpress-ll-20130416.0
Conflicts:
drivers/clk/versatile/Makefile
Diffstat (limited to 'include/linux/vexpress.h')
| -rw-r--r-- | include/linux/vexpress.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/vexpress.h b/include/linux/vexpress.h index 81fa998e7ad1..8fa1957b87ec 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); |