From fe2a7c05756c5a368843e8233d1c1f3fbf028511 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 27 Nov 2014 07:10:20 -0800
Subject: [PATCH] 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 <sfr@canb.auug.org.au>
Cc: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
.gitignore | 4 ----
.../unisys/common-spar/include/channels/controlframework.h | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6bfac06d79ca3..e213b27f3921a 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 7f1adf64b1735..80e2df139ea35 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 */
--
GitLab