diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:24:13 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:24:13 +0100 |
| commit | 2c69f23b00d63695704fffb24571d7b5bf857403 (patch) | |
| tree | 85c9e127fcb80caa3c6add08303170be269a3c31 /drivers/staging/Makefile | |
| parent | 782d592a927200cd5ecfce3c09a56850c2382f06 (diff) | |
| parent | 36e873dd5107bfff581c8679d0d1a3561cb02b13 (diff) | |
Merge topic branch 'ste-multimedia-framework' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/staging/Makefile')
| -rw-r--r-- | drivers/staging/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 600bafb8964..e1e3f2a72ca 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -57,3 +57,6 @@ obj-$(CONFIG_MFD_NVEC) += nvec/ obj-$(CONFIG_DRM_OMAP) += omapdrm/ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_CW1200) += cw1200/ +obj-$(CONFIG_U8500_MMIO) += mmio/ +obj-$(CONFIG_U8500_FLASH) += camera_flash/ +obj-$(CONFIG_U8500_CM) += nmf-cm/ |