diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 12:14:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 12:14:26 -0700 |
| commit | 44e63941e789e10409186224ba897ab50c3fa7e0 (patch) | |
| tree | 180adf775f6bb9ab401303e67fc7c6d0c0642d10 /drivers/video/omap/omapfb_main.c | |
| parent | b983e51a73b60b358e2c15a64c0c489cb266fe67 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| download | talos-op-linux-44e63941e789e10409186224ba897ab50c3fa7e0.tar.gz talos-op-linux-44e63941e789e10409186224ba897ab50c3fa7e0.zip | |
Merge v3.9-rc5 into usb-next
We want the fixes here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/omap/omapfb_main.c')
| -rw-r--r-- | drivers/video/omap/omapfb_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index e31f5b33b501..d40612c31a98 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c @@ -32,6 +32,8 @@ #include <linux/omap-dma.h> +#include <mach/hardware.h> + #include "omapfb.h" #include "lcdc.h" |
