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

6
arch/arm/mach-omap2/board-zoom-peripherals.c
View File

@@ -118,7 +118,7 @@ static struct regulator_consumer_supply zoom_vmmc2_supply = {
static struct regulator_consumer_supply zoom_vmmc3_supply = {
.supply = "vmmc",
.dev_name = "mmci-omap-hs.2",
.dev_name = "omap_hsmmc.2",
};
/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
@@ -322,9 +322,7 @@ static struct twl4030_madc_platform_data zoom_madc_data = {
.irq_line = 1,
};
static struct twl4030_codec_audio_data zoom_audio_data = {
.audio_mclk = 26000000,
};
static struct twl4030_codec_audio_data zoom_audio_data;
static struct twl4030_codec_data zoom_codec_data = {
.audio_mclk = 26000000,