diff --git a/.gitignore b/.gitignore index 6bfac06d79ca3b8a41748c84cff20b55d1b87fc9..e213b27f3921a88768201638d6d358f0f0c80419 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 7f1adf64b1735bde715f2217e6114b881f288aef..80e2df139ea3529d65ae17a9a4ea684e370659a9 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 #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 */