summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/include/mach/entry-macro.S
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-15 21:05:52 +0000
committerArnd Bergmann <arnd@arndb.de>2012-03-15 21:05:52 +0000
commit38abdcd0d0689aaca94e740ac67a952c7918caef (patch)
tree83051487c15c3a062eb4dbff16c13e517c309a78 /arch/arm/mach-omap2/include/mach/entry-macro.S
parent709baa67c676a187a63c0f0f40efceb3fb1eef72 (diff)
parent61b80086a525c8a6081257ae40da5dee2bcaee16 (diff)
downloadblackbird-op-linux-38abdcd0d0689aaca94e740ac67a952c7918caef.tar.gz
blackbird-op-linux-38abdcd0d0689aaca94e740ac67a952c7918caef.zip
Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2
Conflicts: arch/arm/mach-tegra/common.c arch/arm/mach-ux500/devices-common.c This resolves two conflicts and lets us merge the exynos5 branch cleanly. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/include/mach/entry-macro.S')
-rw-r--r--arch/arm/mach-omap2/include/mach/entry-macro.S18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/include/mach/entry-macro.S b/arch/arm/mach-omap2/include/mach/entry-macro.S
deleted file mode 100644
index 56964a0c4c7e..000000000000
--- a/arch/arm/mach-omap2/include/mach/entry-macro.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * arch/arm/plat-omap/include/mach/entry-macro.S
- *
- * Low-level IRQ helper macros for OMAP-based platforms
- *
- * Copyright (C) 2009 Texas Instruments
- * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com>
- *
- * 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.
- */
-
- .macro disable_fiq
- .endm
-
- .macro arch_ret_to_user, tmp1, tmp2
- .endm
OpenPOWER on IntegriCloud