Revert "hcrypto: avoid key_type redefinition"

This reverts commit 81487fcf3ae93d2efea6f0935a0493680b5d3d11.

This change didn't receive sufficient review before it was pushed.
It breaks builds on IRIX, and produces kernel modules that don't
load on a number of other Linux-based systems.

A correct fix for the underlying problem (that both Linux and
hcrypto want to use the "struct key_type" identifier) will follow
this patch.

Change-Id: Ib215f9d8adde75180a86f985052c77600a294895
Reviewed-on: http://gerrit.openafs.org/4191
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/crypto/hcrypto/kernel/config.h b/src/crypto/hcrypto/kernel/config.h
index b757bac..29e9947 100644 (file)
--- a/src/crypto/hcrypto/kernel/config.h
+++ b/src/crypto/hcrypto/kernel/config.h
@@ -26,8 +26,7 @@
 #include "afs/param.h"
 
 #include "afs/stds.h"
-/* struct key_type conflicts with linux, and this includes linux/security.h */
-/* #include "afs/sysincludes.h" */
+#include "afs/sysincludes.h"
 
 /* Asserting is a mess - we need the RX headers in order to get a definition
  * for osi_Assert */