diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 19:00:33 -0400 |
| commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
| tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /arch/arm/common | |
| parent | fb395884576684ebb54b19b1054f4caed589d5f0 (diff) | |
| parent | 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/amba.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/amba.c b/arch/arm/common/amba.c index a0507f8c33fe..c6beb751f2a9 100644 --- a/arch/arm/common/amba.c +++ b/arch/arm/common/amba.c | |||
| @@ -169,7 +169,7 @@ static void amba_device_release(struct device *dev) | |||
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | #define amba_attr(name,fmt,arg...) \ | 171 | #define amba_attr(name,fmt,arg...) \ |
| 172 | static ssize_t show_##name(struct device *_dev, char *buf) \ | 172 | static ssize_t show_##name(struct device *_dev, struct device_attribute *attr, char *buf) \ |
| 173 | { \ | 173 | { \ |
| 174 | struct amba_device *dev = to_amba_device(_dev); \ | 174 | struct amba_device *dev = to_amba_device(_dev); \ |
| 175 | return sprintf(buf, fmt, arg); \ | 175 | return sprintf(buf, fmt, arg); \ |