diff options
| author | Colin Cross <ccross@android.com> | 2011-06-14 11:47:26 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 11:47:26 -0700 |
| commit | 30ca232faa909aff1608c0e3ba3bcaae9f673790 (patch) | |
| tree | a4340621c0d3db0545ddb529cb55b16157ecb868 /arch/arm/mach-omap2/devices.c | |
| parent | 43632c1867030b138c17532c0ed60f873878f20c (diff) | |
| parent | 4c763ebba6eed82575f83aafb4184059555c55f5 (diff) | |
| download | kernel_samsung_tuna-30ca232faa909aff1608c0e3ba3bcaae9f673790.zip kernel_samsung_tuna-30ca232faa909aff1608c0e3ba3bcaae9f673790.tar.gz kernel_samsung_tuna-30ca232faa909aff1608c0e3ba3bcaae9f673790.tar.bz2 | |
Merge branch 'linux-omap-audio-3.0' into linux-omap-3.0
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 8df5bc9..d2b7058 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -293,6 +293,21 @@ static inline void omap_init_mbox(void) { } static inline void omap_init_sti(void) {} +#if defined CONFIG_ARCH_OMAP4 + +static struct platform_device omap_abe_dai = { + .name = "omap-abe-dai", + .id = -1, +}; + +static inline void omap_init_abe(void) +{ + platform_device_register(&omap_abe_dai); +} +#else +static inline void omap_init_abe(void) {} +#endif + #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE) static struct platform_device omap_pcm = { @@ -739,6 +754,7 @@ static int __init omap2_init_devices(void) * please keep these calls, and their implementations above, * in alphabetical order so they're easier to sort through. */ + omap_init_abe(); omap_init_audio(); omap_init_camera(); omap_init_mbox(); |