diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 18:05:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 18:05:37 +0100 |
| commit | 2849a3a945d0e440fa245c47c49c80ef1cc103c3 (patch) | |
| tree | 616868130f4b8a063cfa1c138135c10247a4da0e /drivers/video/ep93xx-fb.c | |
| parent | USB: EHCI: fix up incorrect merge resolution (diff) | |
| parent | Linux 3.9-rc4 (diff) | |
| download | linux-2849a3a945d0e440fa245c47c49c80ef1cc103c3.tar.xz linux-2849a3a945d0e440fa245c47c49c80ef1cc103c3.zip | |
Merge 3.9-rc4 into usb-next
This picks up the fixes we had for USB in 3.9-rc4
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/ep93xx-fb.c')
| -rw-r--r-- | drivers/video/ep93xx-fb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c index 3f2519d30715..e06cd5d90c97 100644 --- a/drivers/video/ep93xx-fb.c +++ b/drivers/video/ep93xx-fb.c @@ -23,6 +23,7 @@ #include <linux/slab.h> #include <linux/clk.h> #include <linux/fb.h> +#include <linux/io.h> #include <linux/platform_data/video-ep93xx.h> |