diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-26 18:06:06 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 18:06:06 -0400 |
| commit | aef7b83c92dd0b7e994805440655d1d64147287b (patch) | |
| tree | 981f373358c1988e061625e8f272013065cb086f /arch/ppc/syslib/ocp.c | |
| parent | b1fc5505e0dbcc3fd7c75bfe6bee39ec50080963 (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
| download | kernel-crypto-aef7b83c92dd0b7e994805440655d1d64147287b.tar.gz kernel-crypto-aef7b83c92dd0b7e994805440655d1d64147287b.tar.xz kernel-crypto-aef7b83c92dd0b7e994805440655d1d64147287b.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ppc/syslib/ocp.c')
| -rw-r--r-- | arch/ppc/syslib/ocp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c index a5156c5179a..e5fd2ae503e 100644 --- a/arch/ppc/syslib/ocp.c +++ b/arch/ppc/syslib/ocp.c @@ -68,7 +68,7 @@ static int ocp_inited; /* Sysfs support */ #define OCP_DEF_ATTR(field, format_string) \ static ssize_t \ -show_##field(struct device *dev, char *buf) \ +show_##field(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct ocp_device *odev = to_ocp_dev(dev); \ \ |