diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-12-26 14:27:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-27 15:46:03 +0100 |
| commit | 270384ccfc2ba3849b9d02f7a37c395987c30ed2 (patch) | |
| tree | 01db6a7730d02094314c32445f452060284c46f8 /sound/atmel | |
| parent | eb58d4844b4ee797bbefa6a75db3a999b71209b1 (diff) | |
| download | linux-270384ccfc2ba3849b9d02f7a37c395987c30ed2.tar.gz linux-270384ccfc2ba3849b9d02f7a37c395987c30ed2.tar.bz2 linux-270384ccfc2ba3849b9d02f7a37c395987c30ed2.zip | |
ALSA: atmel: fix building the ac97 driver for at91-multiplatform
at91 will no longer export the mach/cpu.h and mach/hardware.h header files
in the future, which would break building the atmel ac97c driver.
Since the cpu_is_* check is only used to find out whether we are running
on avr32 or arm/at91, we can hardcode that check in the ARM case.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: http://www.spinics.net/lists/arm-kernel/msg382068.html
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/atmel')
| -rw-r--r-- | sound/atmel/ac97c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index 4f6b14d704f3..5e6a1db70948 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -34,10 +34,10 @@ #include <linux/platform_data/dma-dw.h> #include <linux/dma/dw.h> +#ifdef CONFIG_AVR32 #include <mach/cpu.h> - -#ifdef CONFIG_ARCH_AT91 -#include <mach/hardware.h> +#else +#define cpu_is_at32ap7000() 0 #endif #include "ac97c.h" |