summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-18 07:41:25 -0700
committerOlof Johansson <olof@lixom.net>2012-09-18 07:41:25 -0700
commit0921dcea79e482fcd20aa3670f9d937320fe2a87 (patch)
treefdf9b9f5de482290bc69a037bcebae0efbb2020b /arch
parentd7235b8b92e7f7bdff8d1af9981773c29537a7de (diff)
parenta704835d6a7a8254067a1be60d614cd5c0c73e44 (diff)
downloadlinux-3.10-0921dcea79e482fcd20aa3670f9d937320fe2a87.tar.gz
linux-3.10-0921dcea79e482fcd20aa3670f9d937320fe2a87.tar.bz2
linux-3.10-0921dcea79e482fcd20aa3670f9d937320fe2a87.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: kzm9g: bugfix: correct mmcif interrupt settings
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/board-kzm9g.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 53b7ea92c32..3b8a0171c3c 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -346,11 +346,11 @@ static struct resource sh_mmcif_resources[] = {
.flags = IORESOURCE_MEM,
},
[1] = {
- .start = gic_spi(141),
+ .start = gic_spi(140),
.flags = IORESOURCE_IRQ,
},
[2] = {
- .start = gic_spi(140),
+ .start = gic_spi(141),
.flags = IORESOURCE_IRQ,
},
};