[alsa-devel] [PATCH] alsa: fix invalid hardware.h include in ac97c for AVR32 architecture
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 {
At Mon, 24 Jan 2011 16:09:56 +0100, Hans-Christian Egtvedt wrote:
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
Applied now. Thanks.
Takashi
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
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Around Tue 25 Jan 2011 18:09:17 +0100 or thereabout, Takashi Iwai wrote:
At Mon, 24 Jan 2011 16:09:56 +0100, Hans-Christian Egtvedt wrote:
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
Applied now. Thanks.
Thanks, I see you lined it up on your master branch, do you plan pushing it for the 2.6.38 release?
<snipp>
At Tue, 25 Jan 2011 19:31:22 +0100, Hans-Christian Egtvedt wrote:
Around Tue 25 Jan 2011 18:09:17 +0100 or thereabout, Takashi Iwai wrote:
At Mon, 24 Jan 2011 16:09:56 +0100, Hans-Christian Egtvedt wrote:
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
Applied now. Thanks.
Thanks, I see you lined it up on your master branch, do you plan pushing it for the 2.6.38 release?
Yes, the patch was applied to fix/misc branch, which will be included in the next pull request to Linus.
Takashi
<snipp>
-- Best regards, HC
participants (3)
-
Hans-Christian Egtvedt
-
Hans-Christian Egtvedt
-
Takashi Iwai