summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2012-02-04 11:29:02 -0800
committerOlof Johansson <olof@lixom.net>2012-02-04 11:38:20 -0800
commitca43784daa7a400407d851799ac69d3de2b2ab4e (patch)
tree81e4e084faf46a0f0d289cc264dd88ffcb296083 /arch
parent864e5e360ebb5acc7a41c6d6ac738a62aa1aa609 (diff)
downloadlinux-3.10-ca43784daa7a400407d851799ac69d3de2b2ab4e.tar.gz
linux-3.10-ca43784daa7a400407d851799ac69d3de2b2ab4e.tar.bz2
linux-3.10-ca43784daa7a400407d851799ac69d3de2b2ab4e.zip
ARM: bcmring: fix build failure in mach-bcmring/arch.c
Upstream commit d1fce9c115eeb93e01c01732dfe9a86cf76009cf "ARM: restart: bcmring: use new restart hook" breaks building of this platform, since what used to be the last field of the MACHINE_START/END block didn't have a trailing comma. Once another field was added below, we get: arch/arm/mach-bcmring/arch.c:198: error: request for member 'restart' in something not a structure or union Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Jiandong Zheng <jdzheng@broadcom.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-bcmring/arch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c
index 9e5e7552498..45c97b1ee9b 100644
--- a/arch/arm/mach-bcmring/arch.c
+++ b/arch/arm/mach-bcmring/arch.c
@@ -194,6 +194,6 @@ MACHINE_START(BCMRING, "BCMRING")
.init_early = bcmring_init_early,
.init_irq = bcmring_init_irq,
.timer = &bcmring_timer,
- .init_machine = bcmring_init_machine
+ .init_machine = bcmring_init_machine,
.restart = bcmring_restart,
MACHINE_END