[PATCH v2] ALSA: atmel: fix building the ac97 driver for at91-multiplatform

Alexandre Belloni alexandre.belloni at free-electrons.com
Sun Dec 21 03:18:09 PST 2014

From: Arnd Bergmann <arnd at arndb.de>

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 at arndb.de>
Link: http://www.spinics.net/lists/arm-kernel/msg382068.html
 sound/atmel/ac97c.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index b59427d5a697..83975f8d5947 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>
+#define cpu_is_at32ap7000() 0
 #include "ac97c.h"

More information about the linux-arm-kernel mailing list