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

Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc' into omap-for-linus

Browse Source 
Conflicts:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
This commit is contained in:
Tony Lindgren
2011-03-02 17:11:18 -08:00
parent 12d7d4e0ed d594f1f31a b176654e77 0a0d128d02 0005ae73cf
commit b2833a0578
54 changed files with 2629 additions and 1202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-omap2/omap_hwmod.c
View File

@@ -1929,6 +1929,7 @@ int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res)
os = oh->slaves[i];
for (j = 0; j < os->addr_cnt; j++) {
(res + r)->name = (os->addr + j)->name;
(res + r)->start = (os->addr + j)->pa_start;
(res + r)->end = (os->addr + j)->pa_end;
(res + r)->flags = IORESOURCE_MEM;