diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-15 07:37:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-15 07:37:22 +0100 |
| commit | 828006de1bddf83b6ecf03ec459c15f7c7c22db7 (patch) | |
| tree | 73a224bf0371b41c9777c2bad8169ed50bcca879 /arch/arm | |
| parent | d0f47ff17f29740eabbd64e11705b7332241714c (diff) | |
| parent | 5ec65ee589fdaca7298b6303fd74ad6c121a8f38 (diff) | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into topic/asoc
Linus decided to go for another week so here's a few more updates - a
mixed bag here, a few minor diagnostic tweaks, some driver enhancements
and the dmaengine conversion for ep93xx drivers which was tested a while
ago and just waiting for a signoff.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c index c2766ae02b4..428459fbca4 100644 --- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c +++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c @@ -263,6 +263,7 @@ static void __init visstrim_m10_board_init(void) imx27_add_fec(NULL); imx_add_gpio_keys(&visstrim_gpio_keys_platform_data); platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); + imx_add_platform_device("mx27vis", 0, NULL, 0, NULL, 0); } static void __init visstrim_m10_timer_init(void) |