Merge branch 'linus' into x86/entry, to resolve conflicts

[mirror_ubuntu-hirsute-kernel.git] / samples / vfs / Makefile

diff --git a/samples/vfs/Makefile b/samples/vfs/Makefile
index 65acdde5c117f5de6db47bd0eb2e0362e6251226..00b6824f9237e7820b14ff061c9c9f50b338d5c7 100644 (file)
--- a/samples/vfs/Makefile
+++ b/samples/vfs/Makefile
@@ -1,10 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
-# List of programs to build
-hostprogs := \
-       test-fsmount \
-       test-statx
+userprogs := test-fsmount test-statx
+always-y := $(userprogs)
 
-always-y := $(hostprogs)
-
-HOSTCFLAGS_test-fsmount.o += -I$(objtree)/usr/include
-HOSTCFLAGS_test-statx.o += -I$(objtree)/usr/include
+userccflags += -I usr/include