diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 15:35:47 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 15:35:47 -0800 |
commit | 67acd8b4b7a3f1b183ae358e1dfdb8a80e170736 (patch) | |
tree | 4418034f6e83f954337a17bc6a872fa5ae3c4b5e /kernel/Makefile | |
parent | b13d3720ecd29d5044334fdbbae3432f26802bae (diff) | |
parent | ad160d23198193135cb2bcc75222e0816b5838c0 (diff) | |
download | op-kernel-dev-67acd8b4b7a3f1b183ae358e1dfdb8a80e170736.zip op-kernel-dev-67acd8b4b7a3f1b183ae358e1dfdb8a80e170736.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async
* git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async:
async: don't do the initcall stuff post boot
bootchart: improve output based on Dave Jones' feedback
async: make the final inode deletion an asynchronous event
fastboot: Make libata initialization even more async
fastboot: make the libata port scan asynchronous
fastboot: make scsi probes asynchronous
async: Asynchronous function calls to speed up kernel boot
Diffstat (limited to 'kernel/Makefile')
-rw-r--r-- | kernel/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index e1c5bf3..2921d90 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -9,7 +9,8 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o \ rcupdate.o extable.o params.o posix-timers.o \ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \ hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \ - notifier.o ksysfs.o pm_qos_params.o sched_clock.o cred.o + notifier.o ksysfs.o pm_qos_params.o sched_clock.o cred.o \ + async.o ifdef CONFIG_FUNCTION_TRACER # Do not trace debug files and internal ftrace files |