diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 21:57:53 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 21:57:53 -0400 |
| commit | 8095e4e81b4bc38eef7e0be99f9ecc744eaa1683 (patch) | |
| tree | d3b5100db11784093e78513f3429022569b4bf7b /drivers/video/console | |
| parent | 6b5f146535fe6969aeded9f00b0bc42b3783f7fd (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
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/console')
| -rw-r--r-- | drivers/video/console/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile index a862e9173ebe..48da25c96cd3 100644 --- a/drivers/video/console/Makefile +++ b/drivers/video/console/Makefile | |||
| @@ -18,6 +18,8 @@ font-objs-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o | |||
| 18 | 18 | ||
| 19 | font-objs += $(font-objs-y) | 19 | font-objs += $(font-objs-y) |
| 20 | 20 | ||
| 21 | obj-$(CONFIG_FONTS) += font.o | ||
| 22 | |||
| 21 | # Each configuration option enables a list of files. | 23 | # Each configuration option enables a list of files. |
| 22 | 24 | ||
| 23 | obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o | 25 | obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o |