[094/272] ALSA: fix invalid hardware.h include in ac97c for AVR32 architecture
From: Greg KH
Date: Tue Feb 15 2011 - 20:36:59 EST
2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------
From: Hans-Christian Egtvedt <hans-christian.egtvedt@xxxxxxxxx>
commit fd76804f3f5484b35e6a51214c91e916ebba05aa upstream.
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@xxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
sound/atmel/ac97c.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- 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 {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/