diff options
author | Benjamin Romer <benjamin.romer@unisys.com> | 2014-07-31 12:00:53 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-01 17:38:44 -0400 |
commit | 15c564ecf259bfa16370cf514795a442d3e0fb3c (patch) | |
tree | 30d0f272d733bac82503419f696b8c96571dfdf8 | |
parent | d71772343977ac26a2e996d179dcce1c2931632b (diff) |
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 <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/unisys/common-spar/include/channels/diagchannel.h | 2 | ||||
-rw-r--r-- | drivers/staging/unisys/include/commontypes.h | 1 |
2 files changed, 1 insertions, 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 { | |||
114 | u8 Second; /* 0 - 59 */ | 114 | u8 Second; /* 0 - 59 */ |
115 | u8 Pad1; | 115 | u8 Pad1; |
116 | u32 Nanosecond; /* 0 - 999, 999, 999 */ | 116 | u32 Nanosecond; /* 0 - 999, 999, 999 */ |
117 | S16 TimeZone; /* -1440 to 1440 or 2047 */ | 117 | s16 TimeZone; /* -1440 to 1440 or 2047 */ |
118 | u8 Daylight; | 118 | u8 Daylight; |
119 | u8 Pad2; | 119 | u8 Pad2; |
120 | } DIAG_EFI_TIME; | 120 | } 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 @@ | |||
30 | #include <syslog.h> | 30 | #include <syslog.h> |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #define S16 int16_t | ||
34 | #define S32 int32_t | 33 | #define S32 int32_t |
35 | #define S64 int64_t | 34 | #define S64 int64_t |
36 | 35 | ||