aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-08-25 22:45:37 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-08-25 22:45:37 -0700
commit94d4ac2f4a58c6e37876827c6688c61cef21290c (patch)
tree732f4e4794f3c116041242f69754637f75c0dd57 /arch/arm/mach-integrator
parented21763e7b0b3fb50e4efd9d4bc17ef5b035d304 (diff)
parent08970fc4e0385790a7b093adfaa4165a189f9eb0 (diff)
downloadkernel_samsung_crespo-94d4ac2f4a58c6e37876827c6688c61cef21290c.zip
kernel_samsung_crespo-94d4ac2f4a58c6e37876827c6688c61cef21290c.tar.gz
kernel_samsung_crespo-94d4ac2f4a58c6e37876827c6688c61cef21290c.tar.bz2
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r--arch/arm/mach-integrator/impd1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index 0a7b326..3c8383d 100644
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -405,7 +405,7 @@ static int impd1_probe(struct lm_device *dev)
ret = amba_device_register(d, &dev->resource);
if (ret) {
- dev_err(&d->dev, "unable to register device: %d\n");
+ dev_err(&d->dev, "unable to register device: %d\n", ret);
kfree(d);
}
}