diff options
| author | Greg Kroah-Hartman <[email protected]> | 2014-11-27 07:10:20 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2014-11-27 07:10:20 -0800 |
| commit | fe2a7c05756c5a368843e8233d1c1f3fbf028511 (patch) | |
| tree | 3f08647862bb634ac81f58d4ea805dc386131fa4 | |
| parent | 14ec0838665367b169804a822a65015a1b486986 (diff) | |
Revert "staging: unisys: fix CamelCase macro names in controlframework.h"
This reverts commit 75185f57f110a7c48d9d33a585320c93334adf0c because it
modified the .gitignore file in the root of the tree, without saying it
did so, which isn't acceptable.
Reported-by: Stephen Rothwell <[email protected]>
Cc: Benjamin Romer <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | drivers/staging/unisys/common-spar/include/channels/controlframework.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 6bfac06d79ca..e213b27f3921 100644 --- a/.gitignore +++ b/.gitignore @@ -96,7 +96,3 @@ x509.genkey # Kconfig presets all.config - -#eclipse files -.project -.cproject diff --git a/drivers/staging/unisys/common-spar/include/channels/controlframework.h b/drivers/staging/unisys/common-spar/include/channels/controlframework.h index 7f1adf64b173..80e2df139ea3 100644 --- a/drivers/staging/unisys/common-spar/include/channels/controlframework.h +++ b/drivers/staging/unisys/common-spar/include/channels/controlframework.h @@ -28,14 +28,14 @@ #include <linux/types.h> #include "channel.h" -#define ULTRA_MEMORY_COUNT_KI 1024 +#define ULTRA_MEMORY_COUNT_Ki 1024 /* Scale order 0 is one 32-bit (4-byte) word (in 64 or 128-bit * architecture potentially 64 or 128-bit word) */ #define ULTRA_MEMORY_PAGE_WORD 4 /* Define Ki scale page to be traditional 4KB page */ -#define ULTRA_MEMORY_PAGE_KI (ULTRA_MEMORY_PAGE_WORD * ULTRA_MEMORY_COUNT_KI) +#define ULTRA_MEMORY_PAGE_Ki (ULTRA_MEMORY_PAGE_WORD * ULTRA_MEMORY_COUNT_Ki) struct spar_segment_state { u16 enabled:1; /* Bit 0: May enter other states */ u16 active:1; /* Bit 1: Assigned to active partition */ |