diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-22 23:04:41 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-22 23:04:41 +0100 |
commit | 61b80086a525c8a6081257ae40da5dee2bcaee16 (patch) | |
tree | 675da35e4c03be3a5ca17bf6430e5b51dfed6296 /arch/arm/mach-u300 | |
parent | Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc (diff) | |
parent | ARM: remove disable_fiq and arch_ret_to_user macros (diff) | |
download | linux-61b80086a525c8a6081257ae40da5dee2bcaee16.tar.xz linux-61b80086a525c8a6081257ae40da5dee2bcaee16.zip |
Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r-- | arch/arm/mach-u300/include/mach/entry-macro.S | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-u300/include/mach/entry-macro.S b/arch/arm/mach-u300/include/mach/entry-macro.S deleted file mode 100644 index 7181d6ac6651..000000000000 --- a/arch/arm/mach-u300/include/mach/entry-macro.S +++ /dev/null @@ -1,16 +0,0 @@ -/* - * - * arch-arm/mach-u300/include/mach/entry-macro.S - * - * - * Copyright (C) 2006-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 - * Low-level IRQ helper macros for ST-Ericsson U300 - * Author: Linus Walleij <linus.walleij@stericsson.com> - */ - - .macro disable_fiq - .endm - - .macro arch_ret_to_user, tmp1, tmp2 - .endm |