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
This commit is contained in:
Olof Johansson 2012-09-18 07:41:25 -07:00
commit 0921dcea79

View File

@ -346,11 +346,11 @@ static struct resource sh_mmcif_resources[] = {
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
.start = gic_spi(141), .start = gic_spi(140),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
[2] = { [2] = {
.start = gic_spi(140), .start = gic_spi(141),
.flags = IORESOURCE_IRQ, .flags = IORESOURCE_IRQ,
}, },
}; };