From 75185f57f110a7c48d9d33a585320c93334adf0c Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Thu, 23 Oct 2014 14:30:23 -0400 Subject: [PATCH] staging: unisys: fix CamelCase macro names in controlframework.h Fix CamelCase names: ULTRA_MEMORY_COUNT_Ki => ULTRA_MEMORY_COUNT_KI ULTRA_MEMORY_PAGE_Ki => ULTRA_MEMORY_PAGE_KI Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- .gitignore | 4 ++++ .../staging/unisys/common-spar/include/channels/controlframework.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e213b27..6bfac06 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,7 @@ 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 80e2df1..7f1adf6 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 */ -- 2.7.4