diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:28 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:28 +0800 |
| commit | bb0405fc134f29b78bf52ffe7f3ea2a3678523b5 (patch) | |
| tree | 16d9cb01e6450e97465d8ba4fb4f0adf46736123 /init/Makefile | |
| parent | 2e603f2fe80f061c2267e39775c3fbbc242257ae (diff) | |
| parent | 3ce59d85b792eab5a9d7e3e9decc38a014d5c624 (diff) | |
Merge topic branch 'trace-debug' into integration-linux-ux500
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 |