diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-02 23:28:58 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-02 23:28:58 -0400 |
| commit | df2071bd081408318d659cd14a9cf6ff23d874c9 (patch) | |
| tree | b31291b5fd4b9f84c629833afbfaa8d431857475 /arch/arm/mach-omap2/devices.c | |
| parent | 97e3d94aac1c3e95bd04d1b186479a4df3663ab8 (diff) | |
| parent | be1066bbcd443a65df312fdecea7e4959adedb45 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 7e7acc19bed0..beac46c48c5a 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
| @@ -764,7 +764,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, | |||
| 764 | if (!cpu_is_omap44xx()) | 764 | if (!cpu_is_omap44xx()) |
| 765 | return; | 765 | return; |
| 766 | base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET; | 766 | base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET; |
| 767 | irq = OMAP44XX_IRQ_MMC4; | 767 | irq = OMAP44XX_IRQ_MMC5; |
| 768 | break; | 768 | break; |
| 769 | default: | 769 | default: |
| 770 | continue; | 770 | continue; |