summaryrefslogtreecommitdiff
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2012-04-06 11:11:34 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-04-06 11:11:34 +0200
commite1076f2b6e3e1a8631060238f32c5deb2e37b655 (patch)
tree29b385c6ad57f83d968f1155bacc621355395ac3 /drivers/Makefile
parent51e8d6a38d035e820d1f9ea539d34cd76e348620 (diff)
parent5bf88152dfb4f28f8e2e9a2bf138eb52c87a17e8 (diff)
Merge topic branch 'modem' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index cbc7229016e..42edc9ef222 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -99,6 +99,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_CPU_IDLE) += cpuidle/
obj-y += mmc/
obj-$(CONFIG_MEMSTICK) += memstick/
+obj-$(CONFIG_MODEM) += modem/
obj-y += leds/
obj-$(CONFIG_INFINIBAND) += infiniband/
obj-$(CONFIG_SGI_SN) += sn/