Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 5 Jan 2009 17:34:21 +0000 (18:34 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 5 Jan 2009 17:34:21 +0000 (18:34 +0100)
sound/soc/davinci/davinci-sffsdr.c

index f67579d527655ad3fd84eb9a4e8f0c1bd23b5527..4935d1bcbd8d4733408866475425bc5332fbebb5 100644 (file)
@@ -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");