diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
| commit | 6b995751c2e851d2bc9c277b5884d0adb519e31d (patch) | |
| tree | 7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /drivers/video/Makefile | |
| parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
| parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/video/Makefile')
| -rw-r--r-- | drivers/video/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 97c5d03ac8d9..aa434e725c0d 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile | |||
| @@ -16,7 +16,6 @@ fb-objs := $(fb-y) | |||
| 16 | obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o | 16 | obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o |
| 17 | obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o | 17 | obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o |
| 18 | obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o | 18 | obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o |
| 19 | obj-$(CONFIG_FB_SOFT_CURSOR) += softcursor.o | ||
| 20 | obj-$(CONFIG_FB_MACMODES) += macmodes.o | 19 | obj-$(CONFIG_FB_MACMODES) += macmodes.o |
| 21 | 20 | ||
| 22 | # Hardware specific drivers go first | 21 | # Hardware specific drivers go first |