Patchwork ARM: ux500: Fix build error caused by recent variable name change

login
register
mail settings
Submitter Lee Jones
Date April 27, 2012, 3:36 p.m.
Message ID <1335541015-10155-1-git-send-email-lee.jones@linaro.org>
Download mbox | patch
Permalink /patch/155528/
State New
Headers show

Comments

Lee Jones - April 27, 2012, 3:36 p.m.
error: ‘u8500_soc_node’ undeclared (first use in this function)

Was recently changed to 'u8500_local_bus_nodes'.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/board-mop500.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Linus Walleij - April 27, 2012, 5:48 p.m.
On Fri, Apr 27, 2012 at 5:36 PM, Lee Jones <lee.jones@linaro.org> wrote:

> error: ‘u8500_soc_node’ undeclared (first use in this function)
>
> Was recently changed to 'u8500_local_bus_nodes'.
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

IIRC I already fixed this up when applying the patch renaming the node.

Can you check the ux500-core branch on my linux-stericsson tree?

Thanks,
Linus Walleij
Lee Jones - April 27, 2012, 7:53 p.m.
On 27/04/12 18:48, Linus Walleij wrote:
> On Fri, Apr 27, 2012 at 5:36 PM, Lee Jones<lee.jones@linaro.org>  wrote:
>
>> error: ‘u8500_soc_node’ undeclared (first use in this function)
>>
>> Was recently changed to 'u8500_local_bus_nodes'.
>>
>> Signed-off-by: Lee Jones<lee.jones@linaro.org>
>
> IIRC I already fixed this up when applying the patch renaming the node.
>
> Can you check the ux500-core branch on my linux-stericsson tree?

Just did.

Seemingly the patch was complete after all (I could have sworn that I 
tested it). I have no idea how I lost it from my own tree though.

Scrap this then.

/Lee

Patch

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 39b4a98..bc8a0d7 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -761,7 +761,7 @@  static void __init u8500_init_machine(void)
 		snowball_platform_devs[i]->dev.parent = parent;
 
 	/* automatically probe child nodes of db8500 device */
-	of_platform_populate(NULL, u8500_soc_node, u8500_auxdata_lookup, parent);
+	of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent);
 
 	if (of_machine_is_compatible("st-ericsson,mop500")) {
 		mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR;