diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 03:57:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 03:57:53 +0200 |
| commit | 8095e4e81b4bc38eef7e0be99f9ecc744eaa1683 (patch) | |
| tree | d3b5100db11784093e78513f3429022569b4bf7b /drivers/video/Makefile | |
| parent | TTY:console: update document console.txt (diff) | |
| parent | Linux 3.10-rc3 (diff) | |
| download | linux-8095e4e81b4bc38eef7e0be99f9ecc744eaa1683.tar.xz linux-8095e4e81b4bc38eef7e0be99f9ecc744eaa1683.zip | |
Merge 3.10-rc3 into tty-next
We want these fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/Makefile')
| -rw-r--r-- | drivers/video/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 7234e4a959e8..e8bae8dd4804 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -166,6 +166,7 @@ obj-$(CONFIG_FB_MX3) += mx3fb.o obj-$(CONFIG_FB_DA8XX) += da8xx-fb.o obj-$(CONFIG_FB_MXS) += mxsfb.o obj-$(CONFIG_FB_SSD1307) += ssd1307fb.o +obj-$(CONFIG_FB_SIMPLE) += simplefb.o # the test framebuffer is last obj-$(CONFIG_FB_VIRTUAL) += vfb.o |