From: Greg Kroah-Hartman Date: Thu, 27 Nov 2014 15:10:20 +0000 (-0800) Subject: Revert "staging: unisys: fix CamelCase macro names in controlframework.h" X-Git-Tag: firefly_0821_release~176^2~2665^2~67 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe2a7c05756c5a368843e8233d1c1f3fbf028511;p=firefly-linux-kernel-4.4.55.git 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 Cc: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- 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 #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 */