diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-03 12:32:26 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-03 12:32:26 +0100 |
| commit | 57225b76864210d667b935c54babf22b6c31336b (patch) | |
| tree | cce7eab28de00a88d75b8eda704f5838e10947b1 /arch/arm/mach-vt8500/include/mach/system.h | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
| download | op-kernel-dev-57225b76864210d667b935c54babf22b6c31336b.zip op-kernel-dev-57225b76864210d667b935c54babf22b6c31336b.tar.gz | |
Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9g45.c
Diffstat (limited to 'arch/arm/mach-vt8500/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-vt8500/include/mach/system.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-vt8500/include/mach/system.h b/arch/arm/mach-vt8500/include/mach/system.h index d6c757e..58fa801 100644 --- a/arch/arm/mach-vt8500/include/mach/system.h +++ b/arch/arm/mach-vt8500/include/mach/system.h @@ -7,11 +7,6 @@ /* PM Software Reset request register */ #define VT8500_PMSR_VIRT 0xf8130060 -static inline void arch_idle(void) -{ - cpu_do_idle(); -} - static inline void arch_reset(char mode, const char *cmd) { writel(1, VT8500_PMSR_VIRT); |
