diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-06 13:32:47 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-06 13:32:47 -0800 |
| commit | 00fd72ccc928c1fefc4c9c3b925f82cb71750dfb (patch) | |
| tree | fb77d8bad2e21597ed5d0b34fdd040044999e2c2 /arch/arm/mach-kirkwood | |
| parent | 9cf793f9b8b1ba9414e2a7591b2e911885f85a27 (diff) | |
| parent | 1416408d31236dc2a80d269aa23ffa93aa01e833 (diff) | |
| download | talos-op-linux-00fd72ccc928c1fefc4c9c3b925f82cb71750dfb.tar.gz talos-op-linux-00fd72ccc928c1fefc4c9c3b925f82cb71750dfb.zip | |
Merge branch 'for_3.4/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into cleanup-pm
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/entry-macro.S | 6 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/system.h | 17 |
2 files changed, 0 insertions, 23 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/entry-macro.S b/arch/arm/mach-kirkwood/include/mach/entry-macro.S index 8939d36f893c..82db29f7af8f 100644 --- a/arch/arm/mach-kirkwood/include/mach/entry-macro.S +++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S @@ -10,12 +10,6 @@ #include <mach/bridge-regs.h> - .macro disable_fiq - .endm - - .macro arch_ret_to_user, tmp1, tmp2 - .endm - .macro get_irqnr_preamble, base, tmp ldr \base, =IRQ_VIRT_BASE .endm diff --git a/arch/arm/mach-kirkwood/include/mach/system.h b/arch/arm/mach-kirkwood/include/mach/system.h deleted file mode 100644 index 5fddde002b5e..000000000000 --- a/arch/arm/mach-kirkwood/include/mach/system.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * arch/arm/mach-kirkwood/include/mach/system.h - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#ifndef __ASM_ARCH_SYSTEM_H -#define __ASM_ARCH_SYSTEM_H - -static inline void arch_idle(void) -{ - cpu_do_idle(); -} - -#endif |
