diff options
| author | Olof Johansson <olof@lixom.net> | 2012-08-27 20:07:32 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-08-27 20:07:32 -0400 |
| commit | 314949321ea821a47d266f2c09168a65aa439b3d (patch) | |
| tree | ca41ed9b9e09a546205ec13c6285314b06ab98ea | |
| parent | 9acb172543aecb783e2e1e53e3f447d4c0f5c150 (diff) | |
| parent | 6c0274cbe63ec265f842537825684a619e6cce93 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into fixes
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas:
ARM: shmobile: sh73a0: fixup RELOC_BASE of intca_irq_pins_desc
| -rw-r--r-- | arch/arm/mach-shmobile/intc-sh73a0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c index ee447404c857..588555a67d9c 100644 --- a/arch/arm/mach-shmobile/intc-sh73a0.c +++ b/arch/arm/mach-shmobile/intc-sh73a0.c | |||
| @@ -259,9 +259,9 @@ static int sh73a0_set_wake(struct irq_data *data, unsigned int on) | |||
| 259 | return 0; /* always allow wakeup */ | 259 | return 0; /* always allow wakeup */ |
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | #define RELOC_BASE 0x1000 | 262 | #define RELOC_BASE 0x1200 |
| 263 | 263 | ||
| 264 | /* INTCA IRQ pins at INTCS + 0x1000 to make space for GIC+INTC handling */ | 264 | /* INTCA IRQ pins at INTCS + RELOC_BASE to make space for GIC+INTC handling */ |
| 265 | #define INTCS_VECT_RELOC(n, vect) INTCS_VECT((n), (vect) + RELOC_BASE) | 265 | #define INTCS_VECT_RELOC(n, vect) INTCS_VECT((n), (vect) + RELOC_BASE) |
| 266 | 266 | ||
| 267 | INTC_IRQ_PINS_32(intca_irq_pins, 0xe6900000, | 267 | INTC_IRQ_PINS_32(intca_irq_pins, 0xe6900000, |