diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 00:29:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-14 00:29:38 -0500 |
| commit | 3474cbd11df8cdd6413781ea95bd51dd469098ff (patch) | |
| tree | c8d78f415c00bad503541bee6dd68055997c3ad7 /drivers/video/Makefile | |
| parent | d89b218b801fd93ea95880f1c7fde348cbcc51c5 (diff) | |
| parent | 2d378b9179881b46a0faf11430efb421fe03ddd8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Add very basic XVR-1000 framebuffer driver.
qlogicpti: Remove slash in QlogicPTI irq name
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 a42ad55e3a15..ddc2af2ba45b 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile | |||
| @@ -79,6 +79,7 @@ obj-$(CONFIG_FB_N411) += n411.o | |||
| 79 | obj-$(CONFIG_FB_HGA) += hgafb.o | 79 | obj-$(CONFIG_FB_HGA) += hgafb.o |
| 80 | obj-$(CONFIG_FB_XVR500) += sunxvr500.o | 80 | obj-$(CONFIG_FB_XVR500) += sunxvr500.o |
| 81 | obj-$(CONFIG_FB_XVR2500) += sunxvr2500.o | 81 | obj-$(CONFIG_FB_XVR2500) += sunxvr2500.o |
| 82 | obj-$(CONFIG_FB_XVR1000) += sunxvr1000.o | ||
| 82 | obj-$(CONFIG_FB_IGA) += igafb.o | 83 | obj-$(CONFIG_FB_IGA) += igafb.o |
| 83 | obj-$(CONFIG_FB_APOLLO) += dnfb.o | 84 | obj-$(CONFIG_FB_APOLLO) += dnfb.o |
| 84 | obj-$(CONFIG_FB_Q40) += q40fb.o | 85 | obj-$(CONFIG_FB_Q40) += q40fb.o |