diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:37 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:37 +0800 |
| commit | d3aeada8de410edd0ea3cb1b73381ebae469c584 (patch) | |
| tree | 8b22bec8a39e599c9250e50ab4078425ca749b35 /drivers/staging/Makefile | |
| parent | 591e5e125f9de0513a732371378eeffe09ef4da5 (diff) | |
| parent | 7338b0ab88d72b11989f40394069164d9326afbf (diff) | |
Merge topic branch 'modem' 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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index e4b629258b1..1b023288d9b 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -62,3 +62,4 @@ obj-$(CONFIG_CW1200) += cw1200/ obj-$(CONFIG_U8500_MMIO) += mmio/ obj-$(CONFIG_U8500_FLASH) += camera_flash/ obj-$(CONFIG_U8500_CM) += nmf-cm/ +obj-$(CONFIG_AB5500_SIM) += ab5500_sim/ |