diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-09 02:31:01 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 02:31:01 -0700 |
| commit | d5a2a1ba838f60d92bf67c5eef533e95453752cb (patch) | |
| tree | f6436b5e2b430197f37e49ffff23e91ef694b303 /drivers/video/bfin-lq035q1-fb.c | |
| parent | e1851240a891a305946814587497f121b900b4be (diff) | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
| download | linux-3.10-d5a2a1ba838f60d92bf67c5eef533e95453752cb.tar.gz linux-3.10-d5a2a1ba838f60d92bf67c5eef533e95453752cb.tar.bz2 linux-3.10-d5a2a1ba838f60d92bf67c5eef533e95453752cb.zip | |
Merge tag 'v3.4-rc6' into next/cleanup
Linux 3.4-rc6
Resolve conflict where an u5500 file had a bugfix go in, but was
deleted in the branch staged for next merge window.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/video/bfin-lq035q1-fb.c')
| -rw-r--r-- | drivers/video/bfin-lq035q1-fb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/bfin-lq035q1-fb.c b/drivers/video/bfin-lq035q1-fb.c index 86922ac8441..353c02fe8a9 100644 --- a/drivers/video/bfin-lq035q1-fb.c +++ b/drivers/video/bfin-lq035q1-fb.c @@ -13,6 +13,7 @@ #include <linux/errno.h> #include <linux/string.h> #include <linux/fb.h> +#include <linux/gpio.h> #include <linux/slab.h> #include <linux/init.h> #include <linux/types.h> |