diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-09 16:48:54 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-09 16:48:54 +0900 |
| commit | 5e3a3fbdb17fe819bb419719b36e6ed7f678769d (patch) | |
| tree | b535d2c02e12630250a511d70ada252c4f186c3d /arch | |
| parent | a7bcf21e60c73cb7f7c13fad928967d7e47c3cac (diff) | |
| parent | 2e351ec61c35fac01ed1fb1ce35c183bf85e780c (diff) | |
| download | blackbird-op-linux-5e3a3fbdb17fe819bb419719b36e6ed7f678769d.tar.gz blackbird-op-linux-5e3a3fbdb17fe819bb419719b36e6ed7f678769d.zip | |
Merge branch 'rmobile/core' into rmobile-fixes-for-linus
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/intc-sh7372.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index 32d9e2816e56..63c2fcac8e1e 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c @@ -163,11 +163,13 @@ static struct mtd_partition nor_flash_partitions[] = { .name = "loader", .offset = 0x00000000, .size = 512 * 1024, + .mask_flags = MTD_WRITEABLE, }, { .name = "bootenv", .offset = MTDPART_OFS_APPEND, .size = 512 * 1024, + .mask_flags = MTD_WRITEABLE, }, { .name = "kernel_ro", diff --git a/arch/arm/mach-shmobile/intc-sh7372.c b/arch/arm/mach-shmobile/intc-sh7372.c index 4cd3cae38e72..30b2f400666a 100644 --- a/arch/arm/mach-shmobile/intc-sh7372.c +++ b/arch/arm/mach-shmobile/intc-sh7372.c @@ -98,7 +98,7 @@ static struct intc_vect intca_vectors[] __initdata = { INTC_VECT(IRQ14A, 0x03c0), INTC_VECT(IRQ15A, 0x03e0), INTC_VECT(IRQ16A, 0x3200), INTC_VECT(IRQ17A, 0x3220), INTC_VECT(IRQ18A, 0x3240), INTC_VECT(IRQ19A, 0x3260), - INTC_VECT(IRQ20A, 0x3280), INTC_VECT(IRQ31A, 0x32a0), + INTC_VECT(IRQ20A, 0x3280), INTC_VECT(IRQ21A, 0x32a0), INTC_VECT(IRQ22A, 0x32c0), INTC_VECT(IRQ23A, 0x32e0), INTC_VECT(IRQ24A, 0x3300), INTC_VECT(IRQ25A, 0x3320), INTC_VECT(IRQ26A, 0x3340), INTC_VECT(IRQ27A, 0x3360), |
