diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-05 18:34:21 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-05 18:34:21 +0100 |
| commit | 9d7eff608dbccceb3a5168bd240dc6262ae42459 (patch) | |
| tree | f12831fb230857d2d93bb7b0dc0eb21175152397 /sound | |
| parent | cd8faac38c1c4ff2b404d808f6c623ab47e06475 (diff) | |
| parent | cad9d90ec3f6c497dce2b163046436b6ab5cf6b6 (diff) | |
| download | linux-9d7eff608dbccceb3a5168bd240dc6262ae42459.tar.gz linux-9d7eff608dbccceb3a5168bd240dc6262ae42459.tar.bz2 linux-9d7eff608dbccceb3a5168bd240dc6262ae42459.zip | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/davinci/davinci-sffsdr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c index f67579d52765..4935d1bcbd8d 100644 --- a/sound/soc/davinci/davinci-sffsdr.c +++ b/sound/soc/davinci/davinci-sffsdr.c @@ -24,6 +24,7 @@ #include <sound/soc-dapm.h> #include <asm/dma.h> +#include <asm/mach-types.h> #include <asm/plat-sffsdr/sffsdr-fpga.h> #include <mach/mcbsp.h> @@ -115,6 +116,9 @@ static int __init sffsdr_init(void) { int ret; + if (!machine_is_sffsdr()) + return -EINVAL; + sffsdr_snd_device = platform_device_alloc("soc-audio", 0); if (!sffsdr_snd_device) { printk(KERN_ERR "platform device allocation failed\n"); |