diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2020-07-14 12:18:01 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-07-14 12:18:01 -0700 |
| commit | ec2ffdf65f8b2b64f3f40062f0a24861b72cf39f (patch) | |
| tree | abf9938a2452964a9f2d39b2501f78fe90f7dbe2 /kernel/Makefile | |
| parent | 11bb2f7a45909f4f64afe471875672ae1b84a380 (diff) | |
| parent | f06b71fe4d4cd0a4ad7e183b777564f696f6bb36 (diff) | |
| download | linux-ec2ffdf65f8b2b64f3f40062f0a24861b72cf39f.tar.gz linux-ec2ffdf65f8b2b64f3f40062f0a24861b72cf39f.tar.bz2 linux-ec2ffdf65f8b2b64f3f40062f0a24861b72cf39f.zip | |
Merge branch 'usermode-driver-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace into bpf-next
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index f3218bc5ec69..43928759893a 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ notifier.o ksysfs.o cred.o reboot.o \ async.o range.o smpboot.o ucount.o +obj-$(CONFIG_BPFILTER) += usermode_driver.o obj-$(CONFIG_MODULES) += kmod.o obj-$(CONFIG_MULTIUSER) += groups.o |