diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 00:42:55 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 00:42:55 -0500 |
| commit | d8e7943d821d8ee7f48ff38f6f7c509297c88402 (patch) | |
| tree | 7c3990942d495fd6bdfcdf6e69fe37bda8e4ce33 /arch/sh | |
| parent | df73af86b6e737f357aae85e0b5e621516117780 (diff) | |
| parent | 22efa0fee32d9e7f6f6fbc396a872b5708d86048 (diff) | |
Merge branch 'common/mmcif' into rmobile/mmcif
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/mach-common/mach/romimage.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/mach-ecovec24/mach/romimage.h | 2 | ||||
| -rw-r--r-- | arch/sh/include/mach-kfr2r09/mach/romimage.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/include/mach-common/mach/romimage.h b/arch/sh/include/mach-common/mach/romimage.h index 08fb42269ecd..3670455faaac 100644 --- a/arch/sh/include/mach-common/mach/romimage.h +++ b/arch/sh/include/mach-common/mach/romimage.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #else /* __ASSEMBLY__ */ | 5 | #else /* __ASSEMBLY__ */ |
| 6 | 6 | ||
| 7 | extern inline void mmcif_update_progress(int nr) | 7 | static inline void mmcif_update_progress(int nr) |
| 8 | { | 8 | { |
| 9 | } | 9 | } |
| 10 | 10 | ||
diff --git a/arch/sh/include/mach-ecovec24/mach/romimage.h b/arch/sh/include/mach-ecovec24/mach/romimage.h index 1dcf5e6c8d83..d63ef51ec186 100644 --- a/arch/sh/include/mach-ecovec24/mach/romimage.h +++ b/arch/sh/include/mach-ecovec24/mach/romimage.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #define HIZCRA 0xa4050158 | 35 | #define HIZCRA 0xa4050158 |
| 36 | #define PGDR 0xa405012c | 36 | #define PGDR 0xa405012c |
| 37 | 37 | ||
| 38 | extern inline void mmcif_update_progress(int nr) | 38 | static inline void mmcif_update_progress(int nr) |
| 39 | { | 39 | { |
| 40 | /* disable Hi-Z for LED pins */ | 40 | /* disable Hi-Z for LED pins */ |
| 41 | __raw_writew(__raw_readw(HIZCRA) & ~(1 << 1), HIZCRA); | 41 | __raw_writew(__raw_readw(HIZCRA) & ~(1 << 1), HIZCRA); |
diff --git a/arch/sh/include/mach-kfr2r09/mach/romimage.h b/arch/sh/include/mach-kfr2r09/mach/romimage.h index 976256a323f2..7a883167c846 100644 --- a/arch/sh/include/mach-kfr2r09/mach/romimage.h +++ b/arch/sh/include/mach-kfr2r09/mach/romimage.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #else /* __ASSEMBLY__ */ | 24 | #else /* __ASSEMBLY__ */ |
| 25 | 25 | ||
| 26 | extern inline void mmcif_update_progress(int nr) | 26 | static inline void mmcif_update_progress(int nr) |
| 27 | { | 27 | { |
| 28 | } | 28 | } |
| 29 | 29 | ||