git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
mfd
/
omap-usb-host.c
diff --git
a/drivers/mfd/omap-usb-host.c
b/drivers/mfd/omap-usb-host.c
index
cb01209
..
53450f4
100644
(file)
--- a/
drivers/mfd/omap-usb-host.c
+++ b/
drivers/mfd/omap-usb-host.c
@@
-332,7
+332,7
@@
static int __devinit usbhs_omap_probe(struct platform_device *pdev)
int i;
if (!pdata) {
- dev_err(dev, "Missing platf
ro
m data\n");
+ dev_err(dev, "Missing platf
or
m data\n");
ret = -ENOMEM;
goto end_probe;
}