diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:25 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:25 +0200 |
commit | 1824f16fd3633ea156a90926db7fca2606481346 (patch) | |
tree | 428667dbccfe0fdf8d33bee5a18e8cf1aa0b7767 /drivers/misc/Makefile | |
parent | 453e007c74a011b84260aab6c28250635de2e322 (diff) | |
parent | f7d8ac55db0b41ed64c4cd37f5d51bbd5bb8e776 (diff) |
Merge topic branch 'video' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/misc/Makefile')
-rw-r--r-- | drivers/misc/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 5317121efcd..2741a01610f 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -48,6 +48,9 @@ obj-y += lis3lv02d/ obj-y += carma/ obj-$(CONFIG_STM_TRACE) += stm.o obj-$(CONFIG_HWMEM) += hwmem/ +obj-$(CONFIG_DISPDEV) += dispdev/ +obj-$(CONFIG_COMPDEV) += compdev/ +obj-$(CONFIG_CLONEDEV) += clonedev/ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ obj-$(CONFIG_MAX8997_MUIC) += max8997-muic.o |