diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-16 23:12:26 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 23:13:04 -0400 |
| commit | f4936639bc4a75218b5598ff69c52b9a8dd7f23d (patch) | |
| tree | 9c08fc81cb3d3e658ca7f8dc20a949496d9e6130 /arch/arm/mach-omap1/include/mach/ams-delta-fiq.h | |
| parent | d1226e8f98f130918265fb5b4dddcb60b783eb34 (diff) | |
| parent | 11964f53eb4d9ce59a058be9999d9cfcb1ced878 (diff) | |
Merge tag 'omap-devel-am33xx-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
From Tony Lindgren:
From Paul Walmsley <paul@pwsan.com>:
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
(The shortlog makes no sense here since it contains mostly the dependent
cleanups that are part of the preceding branches).
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap1/include/mach/ams-delta-fiq.h')
| -rw-r--r-- | arch/arm/mach-omap1/include/mach/ams-delta-fiq.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h b/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h index 23eed0035ed8..adb5e7649659 100644 --- a/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h +++ b/arch/arm/mach-omap1/include/mach/ams-delta-fiq.h | |||
| @@ -14,8 +14,6 @@ | |||
| 14 | #ifndef __AMS_DELTA_FIQ_H | 14 | #ifndef __AMS_DELTA_FIQ_H |
| 15 | #define __AMS_DELTA_FIQ_H | 15 | #define __AMS_DELTA_FIQ_H |
| 16 | 16 | ||
| 17 | #include <plat/irqs.h> | ||
| 18 | |||
| 19 | /* | 17 | /* |
| 20 | * Interrupt number used for passing control from FIQ to IRQ. | 18 | * Interrupt number used for passing control from FIQ to IRQ. |
| 21 | * IRQ12, described as reserved, has been selected. | 19 | * IRQ12, described as reserved, has been selected. |