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
This commit is contained in:
Olof Johansson 2012-03-27 17:20:21 -07:00
commit 88b48684fe

View File

@ -23,7 +23,9 @@
*/
#include <linux/linkage.h>
#include <mach/io.h>
#include <asm/assembler.h>
#include <mach/iomap.h>
#include "flowctrl.h"