diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:01 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:01 +0200 |
commit | e71981343ad29b5d929f82ac56c0b27b8ea0e540 (patch) | |
tree | 47135be4252faecbc0e5508658a58f8afd197fff /arch/arm/mach-ep93xx/snappercl15.c | |
parent | Merge branch 'topic/hda' into for-linus (diff) | |
parent | ASoC: TWL4030: Capture route runtime DAPM ordering fix (diff) | |
download | linux-e71981343ad29b5d929f82ac56c0b27b8ea0e540.tar.xz linux-e71981343ad29b5d929f82ac56c0b27b8ea0e540.zip |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-ep93xx/snappercl15.c')
-rw-r--r-- | arch/arm/mach-ep93xx/snappercl15.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index 38deaee40397..a12c89301297 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c @@ -157,6 +157,7 @@ static void __init snappercl15_init_machine(void) ep93xx_register_i2c(&snappercl15_i2c_gpio_data, snappercl15_i2c_data, ARRAY_SIZE(snappercl15_i2c_data)); ep93xx_register_fb(&snappercl15_fb_info); + ep93xx_register_i2s(); platform_device_register(&snappercl15_nand_device); } |