diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:14:07 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:14:07 -0500 |
| commit | 142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6 (patch) | |
| tree | 8cced517382b7087df4e89a9e2a00ccac9676a92 /arch/arm/mach-tegra/irq.c | |
| parent | 155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511 (diff) | |
| parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) | |
Merge branch 'samsung/cleanup' into samsung/driver
Conflicts:
arch/arm/mach-s5p64x0/cpu.c -> common.c
More changes to a file that got moved into common.c,
see previous conflict resolutions.
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 4956c3cea731..8ad82af6a293 100644 --- a/arch/arm/mach-tegra/irq.c +++ b/arch/arm/mach-tegra/irq.c | |||
| @@ -28,10 +28,6 @@ | |||
| 28 | 28 | ||
| 29 | #include "board.h" | 29 | #include "board.h" |
| 30 | 30 | ||
| 31 | #define INT_SYS_NR (INT_GPIO_BASE - INT_PRI_BASE) | ||
| 32 | #define INT_SYS_SZ (INT_SEC_BASE - INT_PRI_BASE) | ||
| 33 | #define PPI_NR ((INT_SYS_NR+INT_SYS_SZ-1)/INT_SYS_SZ) | ||
| 34 | |||
| 35 | #define ICTLR_CPU_IEP_VFIQ 0x08 | 31 | #define ICTLR_CPU_IEP_VFIQ 0x08 |
| 36 | #define ICTLR_CPU_IEP_FIR 0x14 | 32 | #define ICTLR_CPU_IEP_FIR 0x14 |
| 37 | #define ICTLR_CPU_IEP_FIR_SET 0x18 | 33 | #define ICTLR_CPU_IEP_FIR_SET 0x18 |