diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-05 19:07:39 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-05 19:07:39 +0200 |
| commit | 7494e29338fedcfeb5ed1e31eefe5742b786a2be (patch) | |
| tree | aff3c02d6438da09084848b8cacecc0ea69a07e5 /include | |
| parent | 0500602f83884ce74c9bf2daccdad1d51e45d5ee (diff) | |
| parent | 0970369455d02b2fe40567ac4cc93d1250b47bab (diff) | |
| download | kernel-crypto-7494e29338fedcfeb5ed1e31eefe5742b786a2be.tar.gz kernel-crypto-7494e29338fedcfeb5ed1e31eefe5742b786a2be.tar.xz kernel-crypto-7494e29338fedcfeb5ed1e31eefe5742b786a2be.zip | |
Merge branch 'standalone-master' into standalone-rename
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ncr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ncr.h b/include/linux/ncr.h index 53c77be865f..b8ca98eea00 100644 --- a/include/linux/ncr.h +++ b/include/linux/ncr.h @@ -59,7 +59,7 @@ typedef enum { typedef int ncr_key_t; -#define NCR_KEY_INVALID (ncr_key_t)(0) +#define NCR_KEY_INVALID ((ncr_key_t)-1) #define NCR_KEY_FLAG_EXPORTABLE 1 #define NCR_KEY_FLAG_WRAPPABLE (1<<1) @@ -249,7 +249,7 @@ typedef enum { } ncr_crypto_op_t; typedef int ncr_session_t; -#define NCR_SESSION_INVALID (ncr_session_t)0 +#define NCR_SESSION_INVALID ((ncr_session_t)-1) /* input of CIOCGSESSION */ struct ncr_session_st { |