diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-07 09:06:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-07 09:06:13 -0700 |
| commit | 0c30989cc9792bfef6b8844de1d4c7d724e48202 (patch) | |
| tree | d8789ecd5d1f56e6b5a93386ff1bd3f0a9e4d7b5 /arch/tile/kernel/setup.c | |
| parent | 71fae7e714749a52cb8be777ec014f82e8a747f4 (diff) | |
| parent | 2ded5c2484d7375860bdb5f3df1954a346a2da26 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile fixes from Chris Metcalf:
"These two minor bug fixes fix build failures from some changes that
were merged in during the 3.5 merge window."
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: add #include to unbreak build after generic init_task conversion
tile: remove cpu_idle_on_new_stack
Diffstat (limited to 'arch/tile/kernel/setup.c')
| -rw-r--r-- | arch/tile/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c index 6098ccc59be..dd87f342039 100644 --- a/arch/tile/kernel/setup.c +++ b/arch/tile/kernel/setup.c @@ -29,6 +29,7 @@ #include <linux/smp.h> #include <linux/timex.h> #include <linux/hugetlb.h> +#include <linux/start_kernel.h> #include <asm/setup.h> #include <asm/sections.h> #include <asm/cacheflush.h> |