diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-17 20:05:50 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-17 20:05:50 -0800 |
| commit | d695cfa54e9ec48aeb149cadc8dab1240751572a (patch) | |
| tree | 503d342f303181c4a8e4fb89e070117d5760c513 /arch/arm/plat-mxc/include/mach/common.h | |
| parent | c3e00a0eff4c05717915ac7a8e4646db3882aebf (diff) | |
| parent | 3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d (diff) | |
| download | blackbird-op-linux-d695cfa54e9ec48aeb149cadc8dab1240751572a.tar.gz blackbird-op-linux-d695cfa54e9ec48aeb149cadc8dab1240751572a.zip | |
Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc
Conflicts:
arch/arm/mach-tegra/board-dt.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/common.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index c75f254abd85..6698cae942f7 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h @@ -89,7 +89,6 @@ extern void imx_print_silicon_rev(const char *cpu, int srev); void avic_handle_irq(struct pt_regs *); void tzic_handle_irq(struct pt_regs *); -void gic_handle_irq(struct pt_regs *); #define imx1_handle_irq avic_handle_irq #define imx21_handle_irq avic_handle_irq |
