From: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
To: alsa-devel@alsa-project.org
Cc: kernel@avr32linux.org,
Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>,
stable@vger.kernel.org
Subject: [PATCH] alsa: fix invalid hardware.h include in ac97c for AVR32 architecture
Date: Mon, 24 Jan 2011 16:09:56 +0100 [thread overview]
Message-ID: <1295881796-27625-1-git-send-email-hcegtvedt@atmel.com> (raw)
From: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
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@vger.kernel.org
---
This patch also applies to the stable kernels, as the ac97c.c file has not been
compilable for AVR32 since commit 7177395fdd919e561544a7d1c0ac196098a2ae2d
sound/atmel/ac97c.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 10c3a87..b310702 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 {
--
1.7.1
next reply other threads:[~2011-01-24 15:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-24 15:09 Hans-Christian Egtvedt [this message]
2011-01-25 17:09 ` [PATCH] alsa: fix invalid hardware.h include in ac97c for AVR32 architecture Takashi Iwai
2011-01-25 18:31 ` Hans-Christian Egtvedt
2011-01-25 19:05 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1295881796-27625-1-git-send-email-hcegtvedt@atmel.com \
--to=hcegtvedt@atmel.com \
--cc=alsa-devel@alsa-project.org \
--cc=hans-christian.egtvedt@atmel.com \
--cc=kernel@avr32linux.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.