Patchwork [GIT,PULL] ARM: tegra: Include assembler.h in sleep.S to fix build break

login
register
mail settings
Submitter Stephen Warren
Date March 26, 2012, 4:19 p.m.
Message ID <4F709723.4080206@wwwdotorg.org>
Download mbox
Permalink /patch/148778/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git

Comments

Stephen Warren - March 26, 2012, 4:19 p.m.
Arnd, Olof,

This pull request depends on the merge of:

git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
devel/io-cleanup
(specifically 6f6f6a7 ARM: create a common IOMEM definition)

and:

git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.4/soc
(specifically c76fcc8 ARM: tegra: assembler code for LP3)

and is based on a local branch that merges the two branches above.

The following changes since commit 1ad105fc77e61f9dd7a272659a248e2979fdb893:
  Stephen Warren (1):
        Merge remote branch 'remotes/korg_olof_tegra/for-3.4/soc' into
for-3.4/fixes-for-io-cleanup

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
for-3.4/fixes-for-io-cleanup

Stephen Warren (1):
      ARM: tegra: Include assembler.h in sleep.S to fix build break

 arch/arm/mach-tegra/sleep.S |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Olof Johansson - March 28, 2012, 12:56 a.m.
Hi,

On Mon, Mar 26, 2012 at 9:19 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> Arnd, Olof,
>
> This pull request depends on the merge of:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
> devel/io-cleanup
> (specifically 6f6f6a7 ARM: create a common IOMEM definition)
>
> and:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.4/soc
> (specifically c76fcc8 ARM: tegra: assembler code for LP3)
>
> and is based on a local branch that merges the two branches above.
>
> The following changes since commit 1ad105fc77e61f9dd7a272659a248e2979fdb893:
>  Stephen Warren (1):
>        Merge remote branch 'remotes/korg_olof_tegra/for-3.4/soc' into
> for-3.4/fixes-for-io-cleanup

Thanks, pulled into next/cleanup2 (after pulling in tegra/t30-smp into
the same).


-Olof