From: Tony Lindgren <tony@atomide.com>
Date: Fri, 5 Dec 2008 17:40:54 +0000 (-0800)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.28-omap1~92
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=18dd4f865fc2fa5ade67b994af86a250df9b2dbb;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
---

18dd4f865fc2fa5ade67b994af86a250df9b2dbb
diff --cc drivers/video/omap/Makefile
index 881e87d7f6d,ed13889c116..25a47b006fa
--- a/drivers/video/omap/Makefile
+++ b/drivers/video/omap/Makefile
@@@ -26,17 -23,6 +26,16 @@@ objs-y$(CONFIG_MACH_OMAP_PALMZ71) += lc
  objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o
  objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o
  objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o
- objs-y$(CONFIG_MACH_SX1) += lcd_sx1.o
  
 +objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o
 +objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o
 +objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o
 +objs-y$(CONFIG_MACH_OMAP_LDP) += lcd_ldp.o
 +objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o
 +objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o
 +objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o
 +objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o
 +objs-y$(CONFIG_MACH_OVERO) += lcd_overo.o
 +
  omapfb-objs := $(objs-yy)