summaryrefslogtreecommitdiffstats
path: root/drivers/video/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-14 06:29:38 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-14 06:29:38 +0100
commit3474cbd11df8cdd6413781ea95bd51dd469098ff (patch)
treec8d78f415c00bad503541bee6dd68055997c3ad7 /drivers/video/Makefile
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentsparc64: Add very basic XVR-1000 framebuffer driver. (diff)
downloadlinux-3474cbd11df8cdd6413781ea95bd51dd469098ff.tar.xz
linux-3474cbd11df8cdd6413781ea95bd51dd469098ff.zip
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/Makefile1
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
obj-$(CONFIG_FB_HGA) += hgafb.o
obj-$(CONFIG_FB_XVR500) += sunxvr500.o
obj-$(CONFIG_FB_XVR2500) += sunxvr2500.o
+obj-$(CONFIG_FB_XVR1000) += sunxvr1000.o
obj-$(CONFIG_FB_IGA) += igafb.o
obj-$(CONFIG_FB_APOLLO) += dnfb.o
obj-$(CONFIG_FB_Q40) += q40fb.o