Commit fe2a7c05 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "staging: unisys: fix CamelCase macro names in controlframework.h" 



This reverts commit 75185f57 because it
modified the .gitignore file in the root of the tree, without saying it
did so, which isn't acceptable.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 14ec0838

.gitignore

+0 −4
Original line number Diff line number Diff line
@@ -96,7 +96,3 @@ x509.genkey 


# Kconfig presets

all.config
 


#eclipse files

.project

.cproject

drivers/staging/unisys/common-spar/include/channels/controlframework.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */