diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-07-17 14:58:18 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-07-17 14:58:18 +0200 |
| commit | dd849e581d7d23e1729c23bb2d6b85360ce4dd9d (patch) | |
| tree | 3176ddacf7941d95e3743b9af1f5802a3d8ffe0c /arch/arm/mach-tegra/irq.c | |
| parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) | |
| parent | 2fa937a767bd0933dfe6017cabd038ce52594171 (diff) | |
| download | linux-dd849e581d7d23e1729c23bb2d6b85360ce4dd9d.tar.bz2 | |
Merge branch 'for-3.17/fuse-move' into for-3.17/soc
Diffstat (limited to 'arch/arm/mach-tegra/irq.c')
| -rw-r--r-- | arch/arm/mach-tegra/irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c index 1a74d562dca1..da7be13aecce 100644 --- a/arch/arm/mach-tegra/irq.c +++ b/arch/arm/mach-tegra/irq.c @@ -17,14 +17,14 @@ * */ -#include <linux/kernel.h> #include <linux/cpu_pm.h> #include <linux/interrupt.h> -#include <linux/irq.h> #include <linux/io.h> -#include <linux/of.h> -#include <linux/of_address.h> #include <linux/irqchip/arm-gic.h> +#include <linux/irq.h> +#include <linux/kernel.h> +#include <linux/of_address.h> +#include <linux/of.h> #include <linux/syscore_ops.h> #include "board.h" |