From 15c564ecf259bfa16370cf514795a442d3e0fb3c Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Thu, 31 Jul 2014 12:00:53 -0400 Subject: [PATCH] staging: unisys: remove S16 type This patch switches all use of the S16 typedef to use the kernel's s16 type instead. Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- .../staging/unisys/common-spar/include/channels/diagchannel.h | 2 +- drivers/staging/unisys/include/commontypes.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/unisys/common-spar/include/channels/diagchannel.h b/drivers/staging/unisys/common-spar/include/channels/diagchannel.h index eb2f530e2c8e..c01649a985c7 100644 --- a/drivers/staging/unisys/common-spar/include/channels/diagchannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/diagchannel.h @@ -114,7 +114,7 @@ typedef struct _DIAG_EFI_TIME { u8 Second; /* 0 - 59 */ u8 Pad1; u32 Nanosecond; /* 0 - 999, 999, 999 */ - S16 TimeZone; /* -1440 to 1440 or 2047 */ + s16 TimeZone; /* -1440 to 1440 or 2047 */ u8 Daylight; u8 Pad2; } DIAG_EFI_TIME; diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h index 15429f85aaec..8bfa76012bcc 100644 --- a/drivers/staging/unisys/include/commontypes.h +++ b/drivers/staging/unisys/include/commontypes.h @@ -30,7 +30,6 @@ #include #endif -#define S16 int16_t #define S32 int32_t #define S64 int64_t -- 2.34.1