git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
s390
/
crypto
/
z90common.h
diff --git
a/drivers/s390/crypto/z90common.h
b/drivers/s390/crypto/z90common.h
index
bcabac7
..
dbbcda3
100644
(file)
--- a/
drivers/s390/crypto/z90common.h
+++ b/
drivers/s390/crypto/z90common.h
@@
-1,9
+1,9
@@
/*
* linux/drivers/s390/crypto/z90common.h
*
/*
* linux/drivers/s390/crypto/z90common.h
*
- * z90crypt 1.3.
2
+ * z90crypt 1.3.
3
*
*
- * Copyright (C) 2001, 200
4
IBM Corporation
+ * Copyright (C) 2001, 200
5
IBM Corporation
* Author(s): Robert Burroughs (burrough@us.ibm.com)
* Eric Rossman (edrossma@us.ibm.com)
*
* Author(s): Robert Burroughs (burrough@us.ibm.com)
* Eric Rossman (edrossma@us.ibm.com)
*
@@
-27,8
+27,6
@@
#ifndef _Z90COMMON_H_
#define _Z90COMMON_H_
#ifndef _Z90COMMON_H_
#define _Z90COMMON_H_
-#define VERSION_Z90COMMON_H "$Revision: 1.16 $"
-
#define RESPBUFFSIZE 256
#define PCI_FUNC_KEY_DECRYPT 0x5044
#define RESPBUFFSIZE 256
#define PCI_FUNC_KEY_DECRYPT 0x5044
@@
-91,12
+89,13
@@
enum hdstat {
#define TSQ_FATAL_ERROR 34
#define RSQ_FATAL_ERROR 35
#define TSQ_FATAL_ERROR 34
#define RSQ_FATAL_ERROR 35
-#define Z90CRYPT_NUM_TYPES
5
+#define Z90CRYPT_NUM_TYPES
6
#define PCICA 0
#define PCICC 1
#define PCIXCC_MCL2 2
#define PCIXCC_MCL3 3
#define CEX2C 4
#define PCICA 0
#define PCICC 1
#define PCIXCC_MCL2 2
#define PCIXCC_MCL3 3
#define CEX2C 4
+#define CEX2A 5
#define NILDEV -1
#define ANYDEV -1
#define PCIXCC_UNK -2
#define NILDEV -1
#define ANYDEV -1
#define PCIXCC_UNK -2
@@
-105,7
+104,7
@@
enum hdevice_type {
PCICC_HW = 3,
PCICA_HW = 4,
PCIXCC_HW = 5,
PCICC_HW = 3,
PCICA_HW = 4,
PCIXCC_HW = 5,
-
OTHER
_HW = 6,
+
CEX2A
_HW = 6,
CEX2C_HW = 7
};
CEX2C_HW = 7
};
@@
-164,5
+163,4
@@
struct CPRBX {
#define UMIN(a,b) ((a) < (b) ? (a) : (b))
#define IS_EVEN(x) ((x) == (2 * ((x) / 2)))
#define UMIN(a,b) ((a) < (b) ? (a) : (b))
#define IS_EVEN(x) ((x) == (2 * ((x) / 2)))
-
#endif
#endif