diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/powerpc/sysdev/fsl_soc.h | |
| parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
| parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/powerpc/sysdev/fsl_soc.h')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_soc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h index 53609489a62b..2ece02beb8ff 100644 --- a/arch/powerpc/sysdev/fsl_soc.h +++ b/arch/powerpc/sysdev/fsl_soc.h | |||
| @@ -36,5 +36,8 @@ struct platform_diu_data_ops { | |||
| 36 | extern struct platform_diu_data_ops diu_ops; | 36 | extern struct platform_diu_data_ops diu_ops; |
| 37 | #endif | 37 | #endif |
| 38 | 38 | ||
| 39 | void fsl_hv_restart(char *cmd); | ||
| 40 | void fsl_hv_halt(void); | ||
| 41 | |||
| 39 | #endif | 42 | #endif |
| 40 | #endif | 43 | #endif |