summaryrefslogtreecommitdiffstats
path: root/arch/sh/include/mach-common/mach/romimage.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-06-22 11:32:04 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-06-22 11:32:04 -0700
commit0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch)
tree64b6b9655e944284937f5eeff643f0754f35d0af /arch/sh/include/mach-common/mach/romimage.h
parentf5dec51172b81db226a23f309bc737ad021af35b (diff)
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff)
downloadblackbird-obmc-linux-0e789314f8c0b50bd19bf08dc5624b9604d60183.tar.gz
blackbird-obmc-linux-0e789314f8c0b50bd19bf08dc5624b9604d60183.zip
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'arch/sh/include/mach-common/mach/romimage.h')
-rw-r--r--arch/sh/include/mach-common/mach/romimage.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/sh/include/mach-common/mach/romimage.h b/arch/sh/include/mach-common/mach/romimage.h
index 267e24112d82..08fb42269ecd 100644
--- 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__ */
OpenPOWER on IntegriCloud