diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 12:06:36 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 12:06:36 -0500 |
| commit | 421b759b86eb8a914cbbd11f6d09a74f411762c6 (patch) | |
| tree | 505ca7f23987d8eaaa519a7e8506b854e2c0d030 /arch/arm/mach-tegra/irq.c | |
| parent | e067096c8d57d191f29d734cd5692695c95cc36e (diff) | |
| parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) | |
Merge branch 'samsung/cleanup' into next/boards
Conflicts:
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/board-ti8168evm.c
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c
Lots of relatively simple conflicts between the board
changes and stuff from the arm tree. This pulls in
the resolution from the samsung/cleanup tree, so we
don't get conflicting merges.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tegra/irq.c')
| -rw-r--r-- | arch/arm/mach-tegra/irq.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c index 004b0fdf0d7..4e1afcd54fa 100644 --- a/arch/arm/mach-tegra/irq.c +++ b/arch/arm/mach-tegra/irq.c | |||
| @@ -29,10 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #include "board.h" | 30 | #include "board.h" |
| 31 | 31 | ||
| 32 | #define INT_SYS_NR (INT_GPIO_BASE - INT_PRI_BASE) | ||
| 33 | #define INT_SYS_SZ (INT_SEC_BASE - INT_PRI_BASE) | ||
| 34 | #define PPI_NR ((INT_SYS_NR+INT_SYS_SZ-1)/INT_SYS_SZ) | ||
| 35 | |||
| 36 | #define ICTLR_CPU_IEP_VFIQ 0x08 | 32 | #define ICTLR_CPU_IEP_VFIQ 0x08 |
| 37 | #define ICTLR_CPU_IEP_FIR 0x14 | 33 | #define ICTLR_CPU_IEP_FIR 0x14 |
| 38 | #define ICTLR_CPU_IEP_FIR_SET 0x18 | 34 | #define ICTLR_CPU_IEP_FIR_SET 0x18 |