[PATCH v5 25/26] s390: Remove empty <uapi/asm/setup.h>

Alexandre Ghiti alexghiti at rivosinc.com
Mon Mar 6 21:05:07 AEDT 2023


From: Palmer Dabbelt <palmer at rivosinc.com>

Signed-off-by: Palmer Dabbelt <palmer at rivosinc.com>
Signed-off-by: Alexandre Ghiti <alexghiti at rivosinc.com>
Acked-by: Heiko Carstens <hca at linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd at linaro.org>
---
 arch/s390/include/asm/setup.h      | 1 -
 arch/s390/include/uapi/asm/setup.h | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 arch/s390/include/uapi/asm/setup.h

diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index 177bf6deaa27..99c1cc97350a 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -7,7 +7,6 @@
 #define _ASM_S390_SETUP_H
 
 #include <linux/bits.h>
-#include <uapi/asm/setup.h>
 #include <linux/build_bug.h>
 
 #define PARMAREA		0x10400
diff --git a/arch/s390/include/uapi/asm/setup.h b/arch/s390/include/uapi/asm/setup.h
deleted file mode 100644
index 598d769e76df..000000000000
--- a/arch/s390/include/uapi/asm/setup.h
+++ /dev/null
@@ -1 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-- 
2.37.2



More information about the Linuxppc-dev mailing list