git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-msm
/
smd.c
diff --git
a/arch/arm/mach-msm/smd.c
b/arch/arm/mach-msm/smd.c
index cf11d414b425ac48ff2839b178ec2d8fe11188e8..f07dc7c738f0c5a49dce87cb17fe4792f65b4629 100644
(file)
--- a/
arch/arm/mach-msm/smd.c
+++ b/
arch/arm/mach-msm/smd.c
@@
-997,7
+997,7
@@
int smd_core_init(void)
return 0;
}
-static int __init msm_smd_probe(struct platform_device *pdev)
+static int __
dev
init msm_smd_probe(struct platform_device *pdev)
{
pr_info("smd_init()\n");