diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-07 22:51:47 -0500 |
commit | 6b995751c2e851d2bc9c277b5884d0adb519e31d (patch) | |
tree | 7a15b41b5d8ce612915584a0773c670d5c0ab5b8 /Makefile | |
parent | 6c2f4267833f453156f8f439cc32eb4c92f357b4 (diff) | |
parent | d27ba47e7e8c466c18983a1779d611f82d6a354f (diff) |
Merge branch 'master'
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -583,7 +583,7 @@ export MODLIB | |||
583 | 583 | ||
584 | 584 | ||
585 | ifeq ($(KBUILD_EXTMOD),) | 585 | ifeq ($(KBUILD_EXTMOD),) |
586 | core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ | 586 | core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ |
587 | 587 | ||
588 | vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ | 588 | vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ |
589 | $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ | 589 | $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ |