summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-01-05 18:31:38 +0100
committerTakashi Iwai <tiwai@suse.de>2009-01-05 18:31:38 +0100
commitcad9d90ec3f6c497dce2b163046436b6ab5cf6b6 (patch)
tree7fb6bb4bd3257b7d1672ef5e79e225daadd240a0 /sound
parentac11a2b35cc25c77d28218aaf60e7f7c6c7ee5d3 (diff)
parent5cf1c00b0ef3ba964b2ad268a55c278cf43f798f (diff)
downloadop-kernel-dev-cad9d90ec3f6c497dce2b163046436b6ab5cf6b6.zip
op-kernel-dev-cad9d90ec3f6c497dce2b163046436b6ab5cf6b6.tar.gz
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/davinci/davinci-sffsdr.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c
index f67579d..4935d1b 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");
OpenPOWER on IntegriCloud