Merge branch 'topic/asoc' into for-linus

+4
+4
sound/soc/davinci/davinci-sffsdr.c
··· 24 24 #include <sound/soc-dapm.h> 25 25 26 26 #include <asm/dma.h> 27 + #include <asm/mach-types.h> 27 28 #include <asm/plat-sffsdr/sffsdr-fpga.h> 28 29 29 30 #include <mach/mcbsp.h> ··· 115 114 static int __init sffsdr_init(void) 116 115 { 117 116 int ret; 117 + 118 + if (!machine_is_sffsdr()) 119 + return -EINVAL; 118 120 119 121 sffsdr_snd_device = platform_device_alloc("soc-audio", 0); 120 122 if (!sffsdr_snd_device) {