diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:20 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:20 +0200 |
| commit | 36cee0c070a631eb744aff33916dba0d8c92d3d6 (patch) | |
| tree | 707bca58e7bf89a8f1883a8726f0c8c08ec9da11 /init/Makefile | |
| parent | 609cbf05e36abcc92b1e60749b8dd0dc420144fa (diff) | |
| parent | e2673ac489a6fd2f8c4016b1a617f708efb21cc2 (diff) | |
Merge topic branch 'trace-debug' into integration-linux-ux500-3.3
Diffstat (limited to 'init/Makefile')
| -rw-r--r-- | init/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Makefile b/init/Makefile index 0bf677aa087..6b77be3855f 100644 --- a/init/Makefile +++ b/init/Makefile @@ -9,6 +9,7 @@ else obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o endif obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o +obj-$(CONFIG_BOOTTIME) += boottime.o mounts-y := do_mounts.o mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o |