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>

diff --cc .gitignore
Simple merge

diff --cc drivers/staging/unisys/common-spar/include/channels/controlframework.h
Simple merge