diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 16:32:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 16:32:20 -0400 |
| commit | cc6120c6687c34501c0b1d49b4d7e46c63911fed (patch) | |
| tree | a43eeb2ed68ba9ef544fe1f1dc108c8848ba0df9 /drivers/video/console/Makefile | |
| parent | 7b799bc82b5eebb8937ff773e4c4be7260698627 (diff) | |
| parent | f5e09b7cac4a2705f55830db64d448c062e84e8e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/video/console/Makefile')
| -rw-r--r-- | drivers/video/console/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile index b562f6bb9d31..42c7b8dcd220 100644 --- a/drivers/video/console/Makefile +++ b/drivers/video/console/Makefile | |||
| @@ -33,6 +33,10 @@ endif | |||
| 33 | 33 | ||
| 34 | obj-$(CONFIG_FB_STI) += sticore.o font.o | 34 | obj-$(CONFIG_FB_STI) += sticore.o font.o |
| 35 | 35 | ||
| 36 | ifeq ($(CONFIG_USB_SISUSBVGA_CON),y) | ||
| 37 | obj-$(CONFIG_USB_SISUSBVGA) += font.o | ||
| 38 | endif | ||
| 39 | |||
| 36 | # Targets that kbuild needs to know about | 40 | # Targets that kbuild needs to know about |
| 37 | targets := promcon_tbl.c | 41 | targets := promcon_tbl.c |
| 38 | 42 | ||