summaryrefslogtreecommitdiff
path: root/kernel/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-20 09:32:47 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-20 09:32:47 +0200
commitdf36f3e3fbb76d30d623a1623e31e3ce9c2fa750 (patch)
treef8f517a9812b2e94e89c2c0297ea0b235f312d12 /kernel/Makefile
parent65534736d9a5cab5340ae8819e1394b6325e8390 (diff)
parenta111daf0c53ae91e71fd2bfe7497862d14132e3e (diff)
Merge tag 'v5.19-rc3' into tty-next
We need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/Makefile')
-rw-r--r--kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 318789c728d3..a7e1f49ab2b3 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -7,7 +7,7 @@ obj-y = fork.o exec_domain.o panic.o \
cpu.o exit.o softirq.o resource.o \
sysctl.o capability.o ptrace.o user.o \
signal.o sys.o umh.o workqueue.o pid.o task_work.o \
- extable.o params.o \
+ extable.o params.o platform-feature.o \
kthread.o sys_ni.o nsproxy.o \
notifier.o ksysfs.o cred.o reboot.o \
async.o range.o smpboot.o ucount.o regset.o