diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:34 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:34 +0200 |
| commit | e1076f2b6e3e1a8631060238f32c5deb2e37b655 (patch) | |
| tree | 29b385c6ad57f83d968f1155bacc621355395ac3 /drivers/staging/Makefile | |
| parent | 51e8d6a38d035e820d1f9ea539d34cd76e348620 (diff) | |
| parent | 5bf88152dfb4f28f8e2e9a2bf138eb52c87a17e8 (diff) | |
Merge topic branch 'modem' into integration-linux-ux500-3.3
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 e1e3f2a72ca..f1f5eaad334 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -60,3 +60,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/ |