summaryrefslogtreecommitdiffstats
path: root/sound/atmel
diff options
context:
space:
mode:
authorHans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>2011-01-24 16:09:56 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-25 18:07:10 +0100
commitfd76804f3f5484b35e6a51214c91e916ebba05aa (patch)
tree70f5a54bdf8ec3d95f8da2bf96f2e1fe6d0dcb41 /sound/atmel
parentc9ba374d24882c04e7cc000d8cf3b0fe56511b84 (diff)
downloadtalos-op-linux-fd76804f3f5484b35e6a51214c91e916ebba05aa.tar.gz
talos-op-linux-fd76804f3f5484b35e6a51214c91e916ebba05aa.zip
ALSA: fix invalid hardware.h include in ac97c for AVR32 architecture
This patch fixes the non-compiling AC97C driver for AVR32 architecture by include mach/hardware.h only for AT91 architecture. The AVR32 architecture does not supply the hardware.h include file. Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> CC: stable@kernel.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/atmel')
-rw-r--r--sound/atmel/ac97c.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 10c3a871a12d..b310702c646e 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -33,9 +33,12 @@
#include <linux/dw_dmac.h>
#include <mach/cpu.h>
-#include <mach/hardware.h>
#include <mach/gpio.h>
+#ifdef CONFIG_ARCH_AT91
+#include <mach/hardware.h>
+#endif
+
#include "ac97c.h"
enum {
OpenPOWER on IntegriCloud