diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-18 10:41:25 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-18 10:41:25 -0400 |
| commit | 0921dcea79e482fcd20aa3670f9d937320fe2a87 (patch) | |
| tree | fdf9b9f5de482290bc69a037bcebae0efbb2020b | |
| parent | d7235b8b92e7f7bdff8d1af9981773c29537a7de (diff) | |
| parent | a704835d6a7a8254067a1be60d614cd5c0c73e44 (diff) | |
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
| -rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g.c | 4 |
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 53b7ea92c32c..3b8a0171c3cb 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[] = { | |||
| 346 | .flags = IORESOURCE_MEM, | 346 | .flags = IORESOURCE_MEM, |
| 347 | }, | 347 | }, |
| 348 | [1] = { | 348 | [1] = { |
| 349 | .start = gic_spi(141), | 349 | .start = gic_spi(140), |
| 350 | .flags = IORESOURCE_IRQ, | 350 | .flags = IORESOURCE_IRQ, |
| 351 | }, | 351 | }, |
| 352 | [2] = { | 352 | [2] = { |
| 353 | .start = gic_spi(140), | 353 | .start = gic_spi(141), |
| 354 | .flags = IORESOURCE_IRQ, | 354 | .flags = IORESOURCE_IRQ, |
| 355 | }, | 355 | }, |
| 356 | }; | 356 | }; |
