diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-02-16 11:04:05 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-02-18 06:25:22 -0500 |
commit | 40135ea07190316a789b2edfbf7c8131598bdf81 (patch) | |
tree | 835fa39ee899204cf2f64245ad0bc0fbe2bc76a3 /sound/soc/atmel | |
parent | d6943541158985030108e4a0a483cdadc3c80ee1 (diff) |
ASoC: Check machine type before loading on AT91SAM9G20-EK
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/atmel')
-rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index be3f923d3c43..b7efdc8119d4 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <sound/soc.h> | 45 | #include <sound/soc.h> |
46 | #include <sound/soc-dapm.h> | 46 | #include <sound/soc-dapm.h> |
47 | 47 | ||
48 | #include <asm/mach-types.h> | ||
48 | #include <mach/hardware.h> | 49 | #include <mach/hardware.h> |
49 | #include <mach/gpio.h> | 50 | #include <mach/gpio.h> |
50 | 51 | ||
@@ -268,6 +269,9 @@ static int __init at91sam9g20ek_init(void) | |||
268 | struct ssc_device *ssc = NULL; | 269 | struct ssc_device *ssc = NULL; |
269 | int ret; | 270 | int ret; |
270 | 271 | ||
272 | if (!machine_is_at91sam9g20ek()) | ||
273 | return -ENODEV; | ||
274 | |||
271 | /* | 275 | /* |
272 | * Request SSC device | 276 | * Request SSC device |
273 | */ | 277 | */ |