RE: linux-next: manual merge of the sound tree with the pxa tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> Just simple context change. I fiex it up (see below) and can carry the
> fix as necessary.

Yes, this is correct. Thanks Stephen.

>
> --
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> http://www.canb.auug.org.au/~sfr/
>
> diff --cc sound/soc/pxa/pxa2xx-i2s.c
> index 223de89,83b59d7..0000000
> --- a/sound/soc/pxa/pxa2xx-i2s.c
> +++ b/sound/soc/pxa/pxa2xx-i2s.c
> @@@ -24,8 -24,7 +24,7 @@@
>   #include <sound/pxa2xx-lib.h>
>
>   #include <mach/hardware.h>
>  -#include <mach/pxa-regs.h>
>  +#include <mach/dma.h>
> - #include <mach/pxa2xx-gpio.h>
>   #include <mach/audio.h>
>
>   #include "pxa2xx-pcm.h"
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux