Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit 75185f57f1 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>
This commit is contained in:
Greg Kroah-Hartman 2014-11-27 07:10:20 -08:00
parent 14ec083866
commit fe2a7c0575
2 changed files with 2 additions and 6 deletions
.gitignore
drivers/staging/unisys/common-spar/include/channels
controlframework.h

4
.gitignore vendored
View file

@ -96,7 +96,3 @@ x509.genkey
# Kconfig presets
all.config
#eclipse files
.project
.cproject

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

@ -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 */