diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:36 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:36 +0800 |
| commit | 591e5e125f9de0513a732371378eeffe09ef4da5 (patch) | |
| tree | d631e2313179ec61b484f1206e8f873b696ac41c /drivers/staging/Makefile | |
| parent | 6da6382191c30868dd8bf0624f6c2439339b7760 (diff) | |
| parent | 66e68aa37bceeb4279857b48d17023530aed4dbb (diff) | |
Merge topic branch 'ste-multimedia-framework' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
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 71c5803568c..e4b629258b1 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -59,3 +59,6 @@ obj-$(CONFIG_PHONE) += telephony/ obj-$(CONFIG_RAMSTER) += ramster/ obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/ obj-$(CONFIG_CW1200) += cw1200/ +obj-$(CONFIG_U8500_MMIO) += mmio/ +obj-$(CONFIG_U8500_FLASH) += camera_flash/ +obj-$(CONFIG_U8500_CM) += nmf-cm/ |