[PATCH 1/2] ARM: tegra: Fix build error for gic update

[PATCH 1/2] ARM: tegra: Fix build error for gic update

[Hiroshi Doyu]

Fix build error in board-dt-tegra114.c(next-20130204)

Signed-off-by: Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Reported-by: Sami Liedes<sliedes-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/mach-tegra/board-dt-tegra114.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/mach-tegra/board-dt-tegra114.c b/arch/arm/mach-tegra/board-dt-tegra114.c
index 3ed17ce..72598e2 100644
--- a/arch/arm/mach-tegra/board-dt-tegra114.c
+++ b/arch/arm/mach-tegra/board-dt-tegra114.c
@@ -19,7 +19,6 @@
 #include <linux/clocksource.h>
 
 #include <asm/mach/arch.h>
-#include <asm/hardware/gic.h>
 
 #include "board.h"
 #include "common.h"
@@ -39,7 +38,6 @@ DT_MACHINE_START(TEGRA114_DT, "NVIDIA Tegra114 (Flattened Device Tree)")
 	.map_io		= tegra_map_common_io,
 	.init_early	= tegra30_init_early,
 	.init_irq	= tegra_dt_init_irq,
-	.handle_irq	= gic_handle_irq,
 	.init_time	= clocksource_of_init,
 	.init_machine	= tegra114_dt_init,
 	.init_late	= tegra_init_late,
-- 
1.7.9.5

[PATCH 2/2] regmap: Fix build error next-20130204

[Hiroshi Doyu]

In function 'regmap_async_complete_cb':
1656:3: error: 'TASK_NORMAL' undeclared (first use in this function)
In function 'regmap_async_complete':
1688:2: error: 'TASK_UNINTERRUPTIBLE' undeclared (first use in this function)

Signed-off-by: Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 drivers/base/regmap/regmap.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index bee8560..49ec460 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -16,6 +16,8 @@
 #include <linux/mutex.h>
 #include <linux/err.h>
 #include <linux/rbtree.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/regmap.h>
-- 
1.7.9.5

Re: [PATCH 1/2] ARM: tegra: Fix build error for gic update

[Stephen Warren]

On 02/04/2013 04:08 AM, Hiroshi Doyu wrote:
> Fix build error in board-dt-tegra114.c(next-20130204)

Hiroshi, which tree should this patch be applied to? I assume it needs
to go through arm-soc since that's where the Tegra and GIC patches meet?

Re: [PATCH 1/2] ARM: tegra: Fix build error for gic update

[Hiroshi Doyu]

Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> wrote @ Mon, 4 Feb 2013 18:01:15 +0100:

> On 02/04/2013 04:08 AM, Hiroshi Doyu wrote:
> > Fix build error in board-dt-tegra114.c(next-20130204)
> 
> Hiroshi, which tree should this patch be applied to? I assume it needs
> to go through arm-soc since that's where the Tegra and GIC patches meet?

"arm-soc" would be the place. Can you take care of this?

Re: [PATCH 1/2] ARM: tegra: Fix build error for gic update

[Olof Johansson]

On Mon, Feb 04, 2013 at 01:08:18PM +0200, Hiroshi Doyu wrote:
> Fix build error in board-dt-tegra114.c(next-20130204)
> 
> Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
> Reported-by: Sami Liedes<sliedes@nvidia.com>

Applied to arm-soc next/soc, after t114 support.


-Olof