diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-18 18:57:31 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-18 18:57:31 -0400 |
| commit | 665ab0f3c8b8f86bb77b25285ac93870c7054d63 (patch) | |
| tree | c7d12c3559982eb3fb1847438d4b45ce034851e5 /arch/arm/mach-msm/board-trout-panel.c | |
| parent | bf03f65b7967df5807ddef7b99f8a41d4c94fc70 (diff) | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
Merge 3.4-rc3 into tty-next
This allows us to pick up some changes needed for other serial patches.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-msm/board-trout-panel.c')
| -rw-r--r-- | arch/arm/mach-msm/board-trout-panel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/board-trout-panel.c b/arch/arm/mach-msm/board-trout-panel.c index 25105c1027fe..89bf6b426699 100644 --- a/arch/arm/mach-msm/board-trout-panel.c +++ b/arch/arm/mach-msm/board-trout-panel.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <asm/io.h> | 13 | #include <asm/io.h> |
| 14 | #include <asm/mach-types.h> | 14 | #include <asm/mach-types.h> |
| 15 | #include <asm/system_info.h> | ||
| 15 | 16 | ||
| 16 | #include <mach/msm_fb.h> | 17 | #include <mach/msm_fb.h> |
| 17 | #include <mach/vreg.h> | 18 | #include <mach/vreg.h> |