| Message ID | 1419600478-16885-1-git-send-email-alexandre.belloni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
At Fri, 26 Dec 2014 14:27:58 +0100, Alexandre Belloni wrote: > > From: Arnd Bergmann <arnd@arndb.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@arndb.de> > Link: http://www.spinics.net/lists/arm-kernel/msg382068.html > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-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 >
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"