diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-04 23:17:25 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-04 23:17:25 -0400 |
| commit | 54d69df5849ec2e660aa12ac75562618c10fb499 (patch) | |
| tree | adbfb8bcc7cc73b83bf2b784fa331911ba03573a /drivers/video/nuc900fb.c | |
| parent | ad932bb6b549722a561fb31ac2fa50dcbcb3e36b (diff) | |
| parent | 46f2007c1efadfa4071c17e75f140c47f09293de (diff) | |
Merge branch 'late/kirkwood' into late/soc
Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.
Final contents described in shared tag.
Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/video/nuc900fb.c')
| -rw-r--r-- | drivers/video/nuc900fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c index e10f551ade21..93387555337e 100644 --- a/drivers/video/nuc900fb.c +++ b/drivers/video/nuc900fb.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | #include <mach/map.h> | 38 | #include <mach/map.h> |
| 39 | #include <mach/regs-clock.h> | 39 | #include <mach/regs-clock.h> |
| 40 | #include <mach/regs-ldm.h> | 40 | #include <mach/regs-ldm.h> |
| 41 | #include <mach/fb.h> | 41 | #include <linux/platform_data/video-nuc900fb.h> |
| 42 | 42 | ||
| 43 | #include "nuc900fb.h" | 43 | #include "nuc900fb.h" |
| 44 | 44 | ||