lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source
This commit is contained in:
Herbert Xu
2010-05-03 11:28:58 +08:00
parent 97e3d94aac be1066bbcd
commit df2071bd08
7643 changed files with 241568 additions and 106985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/devices.c
View File

@@ -764,7 +764,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
if (!cpu_is_omap44xx())
return;
base = OMAP4_MMC5_BASE + OMAP4_MMC_REG_OFFSET;
irq = OMAP44XX_IRQ_MMC4;
irq = OMAP44XX_IRQ_MMC5;
break;
default:
continue;