Skip to contentSkip to conversation

arm: fix build failure in mach-bcmring/arch.c

PATCH New Paul Gortmaker 3 participants 3 messages Jan 22, 2012 – Feb 4, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: 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

arch/arm/mach-bcmring/arch.c +1 -1
index 9e5e755..45c97b1 100644
@@ -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
Signature · 1 line
1.7.7.2
#1 lore raw

PATCH 1/1 arm: fix build failure in mach-bcmring/arch.c

Quoted 17 lines · Paul Gortmaker

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

arch/arm/mach-bcmring/arch.c +0 -0
index 9e5e755..45c97b1 100644

arch/arm/mach-bcmring/arch.c MACHINE_START(BCMRING, "BCMRING") · line 199

Quoted 7 lines
arch/arm/mach-bcmring/arch.c +1 -1
@@ -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
#2 lore raw

PATCH 1/1 arm: fix build failure in mach-bcmring/arch.c

Quoted 15 lines · Jiandong Zheng
Quoted 14 lines · Paul Gortmaker

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

Quoted 15 lines
Quoted 11 lines
arch/arm/mach-bcmring/arch.c +1 -1
index 9e5e755..45c97b1 100644
@@ -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,
Quoted 1 line

?MACHINE_END

Thanks, applied to arm-soc fixes for -rc.

-Olof