* [PATCH] alsa: fix invalid hardware.h include in ac97c for AVR32 architecture
@ 2011-01-24 15:09 Hans-Christian Egtvedt
2011-01-25 17:09 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Hans-Christian Egtvedt @ 2011-01-24 15:09 UTC (permalink / raw)
To: alsa-devel; +Cc: kernel, Hans-Christian Egtvedt, stable
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] alsa: fix invalid hardware.h include in ac97c for AVR32 architecture
2011-01-24 15:09 [PATCH] alsa: fix invalid hardware.h include in ac97c for AVR32 architecture Hans-Christian Egtvedt
@ 2011-01-25 17:09 ` Takashi Iwai
2011-01-25 18:31 ` Hans-Christian Egtvedt
0 siblings, 1 reply; 4+ messages in thread
From: Takashi Iwai @ 2011-01-25 17:09 UTC (permalink / raw)
To: Hans-Christian Egtvedt; +Cc: alsa-devel, kernel, Hans-Christian Egtvedt, stable
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] alsa: fix invalid hardware.h include in ac97c for AVR32 architecture
2011-01-25 17:09 ` Takashi Iwai
@ 2011-01-25 18:31 ` Hans-Christian Egtvedt
2011-01-25 19:05 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Hans-Christian Egtvedt @ 2011-01-25 18:31 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel, kernel, stable
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>
--
Best regards, HC
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] alsa: fix invalid hardware.h include in ac97c for AVR32 architecture
2011-01-25 18:31 ` Hans-Christian Egtvedt
@ 2011-01-25 19:05 ` Takashi Iwai
0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2011-01-25 19:05 UTC (permalink / raw)
To: Hans-Christian Egtvedt; +Cc: alsa-devel, kernel, stable
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-01-25 19:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-24 15:09 [PATCH] alsa: fix invalid hardware.h include in ac97c for AVR32 architecture Hans-Christian Egtvedt
2011-01-25 17:09 ` Takashi Iwai
2011-01-25 18:31 ` Hans-Christian Egtvedt
2011-01-25 19:05 ` Takashi Iwai
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.