Commit 88b48684 authored by Olof Johansson's avatar Olof Johansson

Merge branch 'for-3.4/fixes-for-io-cleanup' of...

Merge branch 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup2

* 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: Include assembler.h in sleep.S to fix build break
parents b521d929 7175f80b
......@@ -23,7 +23,9 @@
*/
#include <linux/linkage.h>
#include <mach/io.h>
#include <asm/assembler.h>
#include <mach/iomap.h>
#include "flowctrl.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment