linux-kernel - Re: [PATCH v3] ALSA: atmel: fix building the ac97 driver for at91-multiplatform

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <s5hd275i1rb.wl-tiwai@suse.de>
Date:	Sat, 27 Dec 2014 15:52:08 +0100
From:	Takashi Iwai <tiwai@...e.de>
To:	Alexandre Belloni <alexandre.belloni@...e-electrons.com>
Cc:	Jaroslav Kysela <perex@...ex.cz>,
	Alexander Stein <alexanders83@....de>,
	alsa-devel@...a-project.org, linux-kernel@...r.kernel.org,
	linux-arm-kernel@...ts.infradead.org,
	Nicolas Ferre <nicolas.ferre@...el.com>,
	Arnd Bergmann <arnd@...db.de>
Subject: Re: [PATCH v3] ALSA: atmel: fix building the ac97 driver for at91-multiplatform

At Fri, 26 Dec 2014 14:27:58 +0100,
Alexandre Belloni wrote:
> 
> From: Arnd Bergmann <arnd@...db.de>
> 
> at91 will no longer export the mach/cpu.h and mach/hardware.h header files
> in the future, which would break building the atmel ac97c driver.
> 
> Since the cpu_is_* check is only used to find out whether we are running
> on avr32 or arm/at91, we can hardcode that check in the ARM case.
> 
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
> Link: http://www.spinics.net/lists/arm-kernel/msg382068.html
> Signed-off-by: Alexandre Belloni <alexandre.belloni@...e-electrons.com>

Thanks, applied.


Takashi

> ---
> Changes in v3:
>  - added my SoB
> 
>  sound/atmel/ac97c.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
> index b59427d5a697..e458957c5f52 100644
> --- a/sound/atmel/ac97c.c
> +++ b/sound/atmel/ac97c.c
> @@ -34,10 +34,10 @@
>  #include <linux/platform_data/dma-dw.h>
>  #include <linux/dma/dw.h>
>  
> +#ifdef CONFIG_AVR32
>  #include <mach/cpu.h>
> -
> -#ifdef CONFIG_ARCH_AT91
> -#include <mach/hardware.h>
> +#else
> +#define cpu_is_at32ap7000() 0
>  #endif
>  
>  #include "ac97c.h"
> -- 
> 2.1.0
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/