diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-26 16:18:19 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-26 16:18:19 -0400 |
| commit | a0212796b58061a9716178d261f318925c246643 (patch) | |
| tree | e107fbd74e98b301bfb8c964443c6c86a0f609a3 /arch/arm/mach-omap1/fpga.c | |
| parent | 2da8a79f7d81853d00b6a00621aeef7545196084 (diff) | |
| parent | 97af08b6e10e06563309728ed2fe8fdd919c5a33 (diff) | |
Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers
Several fixes for build failures and sparse warnings in the
OMAP cleanup-headers branch. Intended for 3.8 cleanup.
Basic build, boot, and PM test logs are available from here:
http://www.pwsan.com/omap/testlogs/cleanup-headers-compile-fixes-3.8/20121026132711/
Due to underlying problems in v3.7-rc2, several tests fail. These
failures are unrelated to these patches.
Diffstat (limited to 'arch/arm/mach-omap1/fpga.c')
| -rw-r--r-- | arch/arm/mach-omap1/fpga.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index 4ec220d8da5c..d940fac9a9ed 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
| 33 | 33 | ||
| 34 | #include "iomap.h" | 34 | #include "iomap.h" |
| 35 | #include "common.h" | ||
| 35 | 36 | ||
| 36 | static void fpga_mask_irq(struct irq_data *d) | 37 | static void fpga_mask_irq(struct irq_data *d) |
| 37 | { | 38 | { |