diff options
| author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-04-19 17:31:52 -0400 |
|---|---|---|
| committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-04-19 17:31:52 -0400 |
| commit | f70a290e8a889caa905ab7650c696f2bb299be1a (patch) | |
| tree | 56f0886d839499e9f522f189999024b3e86f9be2 /Makefile | |
| parent | fcc9d2e5a6c89d22b8b773a64fb4ad21ac318446 (diff) | |
| parent | 7ef4a793a624c6e66c16ca1051847f75161f5bec (diff) | |
Merge branch 'wip-nested-locking' into tegra-nested-lockingwip-nested-locking
Conflicts:
Makefile
include/linux/fs.h
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -708,7 +708,7 @@ export mod_strip_cmd | |||
| 708 | 708 | ||
| 709 | 709 | ||
| 710 | ifeq ($(KBUILD_EXTMOD),) | 710 | ifeq ($(KBUILD_EXTMOD),) |
| 711 | core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ | 711 | core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ litmus/ |
| 712 | 712 | ||
| 713 | vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ | 713 | vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ |
| 714 | $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ | 714 | $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ |