diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-12-11 19:19:16 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-12-11 19:19:16 -0500 |
| commit | 5ccf197859d6f6bcf56e85657019503b2d95767a (patch) | |
| tree | 85cb5562b550571297cdd347a578ae337eb8f39f /arch/arm/mach-omap2/io.c | |
| parent | 24ed45aa0776f9f645aa1ac1a88b2e1d5f29a9aa (diff) | |
| parent | 435bb827499014ab0e57de75e9606861b08fe894 (diff) | |
Merge branch 'for-next' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index ac9ea6007f27..a8749e8017b9 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <plat/sdrc.h> | 33 | #include <plat/sdrc.h> |
| 34 | #include <plat/gpmc.h> | 34 | #include <plat/gpmc.h> |
| 35 | #include <plat/serial.h> | 35 | #include <plat/serial.h> |
| 36 | #include <plat/mux.h> | ||
| 36 | #include <plat/vram.h> | 37 | #include <plat/vram.h> |
| 37 | 38 | ||
| 38 | #include "clock.h" | 39 | #include "clock.h" |