]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
powerpc: Fallout from sysdev API changes
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 23 Jul 2008 00:44:58 +0000 (10:44 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 25 Jul 2008 05:44:39 +0000 (15:44 +1000)
A struct sysdev_attribute * parameter was added to the show routine by
commit 4a0b2b4dbe1335b8b9886ba3dc85a145d5d938ed "sysdev: Pass the
attribute to the low level sysdev show/store function".

This eliminates a warning:

arch/powerpc/kernel/sysfs.c:538: warning: initialization from incompatible pointer type

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/kernel/sysfs.c

index aba0ba95f0629cf320df4c006a38923d805f0aa8..800e5e9a087bf1c6d73aefde583876736fe32045 100644 (file)
@@ -529,7 +529,8 @@ static void register_nodes(void)
 #endif
 
 /* Only valid if CPU is present. */
-static ssize_t show_physical_id(struct sys_device *dev, char *buf)
+static ssize_t show_physical_id(struct sys_device *dev,
+                               struct sysdev_attribute *attr, char *buf)
 {
        struct cpu *cpu = container_of(dev, struct cpu, sysdev);