diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-10 09:59:21 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-10 09:59:21 -0800 |
| commit | 8e1c9f59442dd4fc80914c224dfd032ca2c284d2 (patch) | |
| tree | 69f03f96ca80c34ff251225e13390de5cbf71b24 /arch/arm/mach-mvebu/system-controller.c | |
| parent | c69bb7bd60fdbb96b57359c7bb0990a7531e0ed1 (diff) | |
| parent | 94c5216ee93b3b4170e7de1556ae6fffd2414c71 (diff) | |
Merge branch 'next/cleanup' into next/dt
Diffstat (limited to 'arch/arm/mach-mvebu/system-controller.c')
| -rw-r--r-- | arch/arm/mach-mvebu/system-controller.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c index 5175083cdb34..a7fb89a5b5d9 100644 --- a/arch/arm/mach-mvebu/system-controller.c +++ b/arch/arm/mach-mvebu/system-controller.c @@ -27,6 +27,7 @@ #include <linux/of_address.h> #include <linux/io.h> #include <linux/reboot.h> +#include "common.h" static void __iomem *system_controller_base; @@ -39,14 +40,14 @@ struct mvebu_system_controller { }; static struct mvebu_system_controller *mvebu_sc; -const struct mvebu_system_controller armada_370_xp_system_controller = { +static const struct mvebu_system_controller armada_370_xp_system_controller = { .rstoutn_mask_offset = 0x60, .system_soft_reset_offset = 0x64, .rstoutn_mask_reset_out_en = 0x1, .system_soft_reset = 0x1, }; -const struct mvebu_system_controller orion_system_controller = { +static const struct mvebu_system_controller orion_system_controller = { .rstoutn_mask_offset = 0x108, .system_soft_reset_offset = 0x10c, .rstoutn_mask_reset_out_en = 0x4, |