diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /Makefile | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
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) \ |