diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 17:32:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 17:32:39 +0100 |
| commit | 333c47c847c90aaefde8b593054d9344106333b5 (patch) | |
| tree | a4aec7b18ffe8d8dd88e027e5e4d84b2d838fe8a /Makefile | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa (diff) | |
| parent | [BLOCK] iosched: fix setting of default io scheduler (diff) | |
| download | linux-333c47c847c90aaefde8b593054d9344106333b5.tar.xz linux-333c47c847c90aaefde8b593054d9344106333b5.zip | |
Merge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -583,7 +583,7 @@ export MODLIB ifeq ($(KBUILD_EXTMOD),) -core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ +core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ |