Hi Stephen. I've pushed out changes to my next-devicetree branch that cause a conflict and a build error when merged with linux-next. I could pull in the conflicting trees, but I'm not sure whether or not that is a good idea. In the mean time I've attached the patches needed to resolve the problems. Cheers, g. -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.
Attachment:
0001-fixup-on-merge
Description: Binary data
From 61564132fa7b660bd27780febac6fdb7f547fac2 Mon Sep 17 00:00:00 2001 From: Grant Likely <grant.likely@xxxxxxxxxxxx> Date: Thu, 13 May 2010 16:34:27 +0200 Subject: [PATCH] fixup arch/powerpc/kernel/vio.c --- arch/powerpc/kernel/vio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index b234118..eeae002 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c @@ -1332,7 +1332,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, struct device_node *dn; const char *cp; - dn = dev->archdata.of_node; + dn = dev->of_node; if (!dn) return -ENODEV; cp = of_get_property(dn, "compatible", NULL); -- 1.7.0.4
