diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 15:20:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 15:20:57 -0700 |
commit | 1f7f314bf2a77f1d499b41001ebdafb261f00f30 (patch) | |
tree | aa7eddcf09fe38abb274dffb457e3c0949cfbb3d /drivers/video/omap2/displays/Makefile | |
parent | 2a8ba8f032160552a3beffab8aae9019ff477504 (diff) | |
parent | fce064cbda85dda330150e8d4d9f6db1a3300023 (diff) | |
download | kernel_samsung_smdk4412-1f7f314bf2a77f1d499b41001ebdafb261f00f30.zip kernel_samsung_smdk4412-1f7f314bf2a77f1d499b41001ebdafb261f00f30.tar.gz kernel_samsung_smdk4412-1f7f314bf2a77f1d499b41001ebdafb261f00f30.tar.bz2 |
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (23 commits)
OMAP: DSS2: Fix omap_dss_probe() error path
OMAP: DSS2: omap_dss_probe() conditional compilation cleanup
board-omap3-beagle: add DSS2 support
OMAP2: DSS: Add missing line for update bg color
OMAP3630: DSS2: Updating MAX divider value
OMAP: RX51: Update board defconfig
OMAP: DSS2: Add ACX565AKM Panel Driver
OMAP: RX51: Add Touch Controller in SPI board info
OMAP: RX51: Add LCD Panel support
OMAP: DSS2: TPO-TD03MTEA1: fix Kconfig dependency
OMAP: LCD LS037V7DW01: Add Backlight driver support
OMAP: DSS2: Taal: Fix DSI bus locking problem
OMAP: DSS2: Taal: add mutex to protect panel data
OMAP: DSS2: Make partial update width even
OMAP: DSS2: Fix device disable when driver is not loaded
OMAP: DSS2: VENC: don't call platform_enable/disable() twice
OMAP: DSS2: check lock_fb_info() return value
OMAP: DSS2: fix lock_fb_info() and omapfb_lock() locking order
OMAP: DSS2: Use vdds_sdi regulator supply in SDI
OMAP: DSS2: Remove redundant enable/disable calls from SDI
...
Diffstat (limited to 'drivers/video/omap2/displays/Makefile')
-rw-r--r-- | drivers/video/omap2/displays/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/omap2/displays/Makefile b/drivers/video/omap2/displays/Makefile index e2bb321..aa38609 100644 --- a/drivers/video/omap2/displays/Makefile +++ b/drivers/video/omap2/displays/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_PANEL_SHARP_LQ043T1DG01) += panel-sharp-lq043t1dg01.o obj-$(CONFIG_PANEL_TAAL) += panel-taal.o obj-$(CONFIG_PANEL_TOPPOLY_TDO35S) += panel-toppoly-tdo35s.o obj-$(CONFIG_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o +obj-$(CONFIG_PANEL_ACX565AKM) += panel-acx565akm.o |