projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[cascardo/linux.git]
/
arch
/
sh
/
include
/
mach-common
/
mach
/
romimage.h
diff --git
a/arch/sh/include/mach-common/mach/romimage.h
b/arch/sh/include/mach-common/mach/romimage.h
index
267e241
..
08fb422
100644
(file)
--- a/
arch/sh/include/mach-common/mach/romimage.h
+++ b/
arch/sh/include/mach-common/mach/romimage.h
@@
-1
+1,11
@@
+#ifdef __ASSEMBLY__
+
/* do nothing here by default */
+
+#else /* __ASSEMBLY__ */
+
+extern inline void mmcif_update_progress(int nr)
+{
+}
+
+#endif /* __ASSEMBLY__ */