diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-09 18:49:56 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-09 18:49:56 -0500 |
| commit | fa3c5afc525bacfcdd2ba5107da5a2d93a04b32b (patch) | |
| tree | 9436c31da1eef306de395e7690d7a94e8cb4247f /arch/arm/mach-omap2/Makefile | |
| parent | 054fcd5d3ae013db9efc4e5781bc09a68ff89fdb (diff) | |
| parent | 90c708390a96e87a8255218f86bc18fb616a05b1 (diff) | |
Merge branch 'display-patches-for-linaro-37' of git://dev.omapzoom.org/pub/scm/anand/linux-omap-usb into linaro-2.6.37linaro-linux-2.6.37-upstream-10Feb2011
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 1c0c2b02d87..2e811732f77 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -242,3 +242,6 @@ obj-y += $(smc91x-m) $(smc91x-y) smsc911x-$(CONFIG_SMSC911X) := gpmc-smsc911x.o obj-y += $(smsc911x-m) $(smsc911x-y) + +disp-$(CONFIG_OMAP2_DSS) := display.o +obj-y += $(disp-m) $(disp-y) |