diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-09 08:48:51 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-09 08:48:51 -0700 |
| commit | 782cd9ee985b1523f1ddad57657a24d7855d9e4d (patch) | |
| tree | c60c540c4799ad412161dd11090cee815926efe7 /arch/arm/mach-shmobile/include | |
| parent | 6e3a78d9474f54c0b2b5293a561548106243eeaf (diff) | |
| parent | 21c8715f0a1f4df8bfa2bd6f3915e5e33c1c2e6e (diff) | |
Merge branch 'fixes2' into fixes
Three more warnings fixes from Arnd Bergmann:
* fixes2:
ARM: integrator: use __iomem pointers for MMIO, part 2
ARM: assabet: fix bogus warning in get_assabet_scr (again)
ARM: shmobile: mark shmobile_init_late as __init
Diffstat (limited to 'arch/arm/mach-shmobile/include')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h index ed77ab8c9143..d47e215aca87 100644 --- a/arch/arm/mach-shmobile/include/mach/common.h +++ b/arch/arm/mach-shmobile/include/mach/common.h @@ -100,7 +100,7 @@ static inline int shmobile_cpu_is_dead(unsigned int cpu) { return 1; } extern void shmobile_smp_init_cpus(unsigned int ncores); -static inline void shmobile_init_late(void) +static inline void __init shmobile_init_late(void) { shmobile_suspend_init(); shmobile_cpuidle_init(); |