lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 078/176] ALSA: fix invalid hardware.h include in ac97c for AVR32 architecture
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>

    commit fd76804f3f5484b35e6a51214c91e916ebba05aa upstream.

    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>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/atmel/ac97c.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- 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 {



    \
     
     \ /
      Last update: 2011-02-16 02:13    [W:0.020 / U:1.244 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site