diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-16 09:21:08 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-16 09:21:08 +0400 |
commit | 705eb64e2ed78c63b9e2b6002b029ce8710ff7cf (patch) | |
tree | e4ad7ad6ce919dcc59460b89dfe63e9d2ff9bc63 /arch/arm/mach-shmobile/include/mach/entry-macro.S | |
parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
parent | f36217f3a5b5b945619192c033c2785007931e49 (diff) | |
download | linux-705eb64e2ed78c63b9e2b6002b029ce8710ff7cf.tar.xz |
Merge branch 'musb' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/musb
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/entry-macro.S')
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/entry-macro.S | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/entry-macro.S b/arch/arm/mach-shmobile/include/mach/entry-macro.S index 8d4a416d4285..2a57b2964ee9 100644 --- a/arch/arm/mach-shmobile/include/mach/entry-macro.S +++ b/arch/arm/mach-shmobile/include/mach/entry-macro.S @@ -18,14 +18,5 @@ .macro disable_fiq .endm - .macro get_irqnr_preamble, base, tmp - .endm - - .macro get_irqnr_and_base, irqnr, irqstat, base, tmp - .endm - - .macro test_for_ipi, irqnr, irqstat, base, tmp - .endm - .macro arch_ret_to_user, tmp1, tmp2 .endm |