diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/s390/crypto/z90common.h | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/s390/crypto/z90common.h')
| -rw-r--r-- | drivers/s390/crypto/z90common.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/crypto/z90common.h b/drivers/s390/crypto/z90common.h index bcabac7a7c46..e319e78b5ea2 100644 --- a/drivers/s390/crypto/z90common.h +++ b/drivers/s390/crypto/z90common.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #ifndef _Z90COMMON_H_ | 27 | #ifndef _Z90COMMON_H_ |
| 28 | #define _Z90COMMON_H_ | 28 | #define _Z90COMMON_H_ |
| 29 | 29 | ||
| 30 | #define VERSION_Z90COMMON_H "$Revision: 1.16 $" | 30 | #define VERSION_Z90COMMON_H "$Revision: 1.17 $" |
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | #define RESPBUFFSIZE 256 | 33 | #define RESPBUFFSIZE 256 |
| @@ -164,5 +164,4 @@ struct CPRBX { | |||
| 164 | #define UMIN(a,b) ((a) < (b) ? (a) : (b)) | 164 | #define UMIN(a,b) ((a) < (b) ? (a) : (b)) |
| 165 | #define IS_EVEN(x) ((x) == (2 * ((x) / 2))) | 165 | #define IS_EVEN(x) ((x) == (2 * ((x) / 2))) |
| 166 | 166 | ||
| 167 | |||
| 168 | #endif | 167 | #endif |