aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.gitignore4
-rw-r--r--drivers/staging/unisys/common-spar/include/channels/controlframework.h4
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 */