diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
| commit | 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 (patch) | |
| tree | 99119edc53fdca73ed7586829b8ee736e09440b3 /drivers/video/Makefile | |
| parent | 28cdac6690cb113856293bf79b40de33dbd8f974 (diff) | |
| parent | 1051b9f0f9eab8091fe3bf98320741adf36b4cfa (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
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 485e8ed1318c..9260a898f343 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile | |||
| @@ -100,6 +100,7 @@ obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o | |||
| 100 | obj-$(CONFIG_FB_ASILIANT) += asiliantfb.o | 100 | obj-$(CONFIG_FB_ASILIANT) += asiliantfb.o |
| 101 | obj-$(CONFIG_FB_PXA) += pxafb.o | 101 | obj-$(CONFIG_FB_PXA) += pxafb.o |
| 102 | obj-$(CONFIG_FB_PXA168) += pxa168fb.o | 102 | obj-$(CONFIG_FB_PXA168) += pxa168fb.o |
| 103 | obj-$(CONFIG_PXA3XX_GCU) += pxa3xx-gcu.o | ||
| 103 | obj-$(CONFIG_FB_W100) += w100fb.o | 104 | obj-$(CONFIG_FB_W100) += w100fb.o |
| 104 | obj-$(CONFIG_FB_TMIO) += tmiofb.o | 105 | obj-$(CONFIG_FB_TMIO) += tmiofb.o |
| 105 | obj-$(CONFIG_FB_AU1100) += au1100fb.o | 106 | obj-$(CONFIG_FB_AU1100) += au1100fb.o |