diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
| commit | cc44826a26b12b2489bc7dbb597fcdf107f2cc01 (patch) | |
| tree | 98a7958212ac61345300944f512a949e5ee3e513 /arch/sh/include/mach-common/mach/romimage.h | |
| parent | 482e6f8466ab1066f1a969bcdbe916b56439622c (diff) | |
| parent | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/sh/include/mach-common/mach/romimage.h')
| -rw-r--r-- | arch/sh/include/mach-common/mach/romimage.h | 10 |
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 @@ | |||
| 1 | #ifdef __ASSEMBLY__ | ||
| 2 | |||
| 1 | /* do nothing here by default */ | 3 | /* do nothing here by default */ |
| 4 | |||
| 5 | #else /* __ASSEMBLY__ */ | ||
| 6 | |||
| 7 | extern inline void mmcif_update_progress(int nr) | ||
| 8 | { | ||
| 9 | } | ||
| 10 | |||
| 11 | #endif /* __ASSEMBLY__ */ | ||