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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.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
08fb422
..
3670455
100644
(file)
--- a/
arch/sh/include/mach-common/mach/romimage.h
+++ b/
arch/sh/include/mach-common/mach/romimage.h
@@
-4,7
+4,7
@@
#else /* __ASSEMBLY__ */
-
extern
inline void mmcif_update_progress(int nr)
+
static
inline void mmcif_update_progress(int nr)
{
}