From c7184cbf5530da955407be46dd120eb7111d8973 Mon Sep 17 00:00:00 2001 From: Dave Penkler Date: Fri, 18 Apr 2025 11:31:11 +0200 Subject: [PATCH] staging: gpib: Rename common include file User code includes gpib_user.h. Since this include has diverged from the original by - removing unused functions and defines - changing camel-case identifiers - removing typedefs we need to change the name of the kernel include. This include will be included in the userland gpib_user.h ensuring backward compatibility for application programmes. Rename the file and change the references to it. Signed-off-by: Dave Penkler Link: https://lore.kernel.org/r/20250418093111.8820-3-dpenkler@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gpib/include/gpibP.h | 2 +- drivers/staging/gpib/include/gpib_types.h | 2 +- drivers/staging/gpib/uapi/{gpib_user.h => gpib.h} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename drivers/staging/gpib/uapi/{gpib_user.h => gpib.h} (100%) diff --git a/drivers/staging/gpib/include/gpibP.h b/drivers/staging/gpib/include/gpibP.h index 6461b330a3c3..0af72934ce24 100644 --- a/drivers/staging/gpib/include/gpibP.h +++ b/drivers/staging/gpib/include/gpibP.h @@ -11,7 +11,7 @@ #include "gpib_types.h" #include "gpib_proto.h" -#include "gpib_user.h" +#include "gpib.h" #include "gpib_ioctl.h" #include diff --git a/drivers/staging/gpib/include/gpib_types.h b/drivers/staging/gpib/include/gpib_types.h index 9e0dfdb9904d..2af4574d400c 100644 --- a/drivers/staging/gpib/include/gpib_types.h +++ b/drivers/staging/gpib/include/gpib_types.h @@ -8,7 +8,7 @@ #define _GPIB_TYPES_H #ifdef __KERNEL__ -#include "gpib_user.h" +#include "gpib.h" #include #include #include diff --git a/drivers/staging/gpib/uapi/gpib_user.h b/drivers/staging/gpib/uapi/gpib.h similarity index 100% rename from drivers/staging/gpib/uapi/gpib_user.h rename to drivers/staging/gpib/uapi/gpib.h -- 2.25.1