diff options
author | Rob Herring <r.herring@freescale.com> | 2008-02-14 14:44:21 -0600 |
---|---|---|
committer | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2008-08-25 15:18:55 -0400 |
commit | 3f8ed3afb9cee6648f9650d5daf950bb9347cca6 (patch) | |
tree | c9e28cdb34524d44c5dc4dc0778ebdcb858af20c /include/asm-arm/arch-mxc/system.h | |
parent | 49914084e797530d9baaf51df9eda77babc98fa8 (diff) |
ENGR00065563 Merge L2622-01 to 2.6.24
Merge L2622-01 release to 2.6.24 kernel.
Diffstat (limited to 'include/asm-arm/arch-mxc/system.h')
-rw-r--r-- | include/asm-arm/arch-mxc/system.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/include/asm-arm/arch-mxc/system.h b/include/asm-arm/arch-mxc/system.h index 109956b41aca..a9fcb4303b66 100644 --- a/include/asm-arm/arch-mxc/system.h +++ b/include/asm-arm/arch-mxc/system.h @@ -22,29 +22,23 @@ #define __ASM_ARCH_MXC_SYSTEM_H__ /*! - * @file system.h + * @file arch-mxc/system.h * @brief This file contains idle and reset functions. * - * @ingroup System + * @ingroup MSL_MX27 MSL_MX31 MSL_MXC91321 */ /*! * This function puts the CPU into idle mode. It is called by default_idle() * in process.c file. */ -static inline void arch_idle(void) -{ - cpu_do_idle(); -} +extern void arch_idle(void); /* * This function resets the system. It is called by machine_restart(). * * @param mode indicates different kinds of resets */ -static inline void arch_reset(char mode) -{ - cpu_reset(0); -} +extern void arch_reset(char mode); #endif /* __ASM_ARCH_MXC_SYSTEM_H__ */ |