diff options
author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:24:14 +0100 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:24:14 +0100 |
commit | f7733363e6625437f4d42faf58d22dfd247a6c77 (patch) | |
tree | 4c837a761d8e1a6d8489624433edb52944d492fe /drivers/Makefile | |
parent | 2c69f23b00d63695704fffb24571d7b5bf857403 (diff) | |
parent | dccf714b737a9e6de759045f32ba07d93ada36e5 (diff) |
Merge topic branch 'modem' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers/Makefile')
-rw-r--r-- | drivers/Makefile | 1 |
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/ |