From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 30 Sep 2012 08:04:50 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-next
X-Git-Tag: next-20121001~118^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f537d068a864d26708786f64307c962ee2731ab4;p=karo-tx-linux.git

Merge branch 'devel-stable' into for-next
---

f537d068a864d26708786f64307c962ee2731ab4
diff --cc arch/arm/kernel/setup.c
index 0785472460a8,04fd01feea86..df6cd7307bd7
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -53,7 -55,11 +53,8 @@@
  #include <asm/traps.h>
  #include <asm/unwind.h>
  #include <asm/memblock.h>
+ #include <asm/virt.h>
  
 -#if defined(CONFIG_DEPRECATED_PARAM_STRUCT)
 -#include "compat.h"
 -#endif
  #include "atags.h"
  #include "tcm.h"