summaryrefslogtreecommitdiff
path: root/drivers/s390/crypto/z90crypt.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-24 09:03:34 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-24 09:03:34 +0400
commit75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch)
tree1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /drivers/s390/crypto/z90crypt.h
parent8531c5ffbca65f6df868637c26e6df6f88bff738 (diff)
parent0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff)
downloadlinux-75a95178dafb5c8d69b4abe45ea746a9cea23142.tar.xz
Merge upstream into 'upstream' branch of netdev-2.6.git.
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
Diffstat (limited to 'drivers/s390/crypto/z90crypt.h')
-rw-r--r--drivers/s390/crypto/z90crypt.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/s390/crypto/z90crypt.h b/drivers/s390/crypto/z90crypt.h
index 82a1d97001d7..0a3bb5a10dd4 100644
--- a/drivers/s390/crypto/z90crypt.h
+++ b/drivers/s390/crypto/z90crypt.h
@@ -36,15 +36,6 @@
#define z90crypt_VARIANT 2 // 2 = added PCIXCC MCL3 and CEX2C support
/**
- * If we are not using the sparse checker, __user has no use.
- */
-#ifdef __CHECKER__
-# define __user __attribute__((noderef, address_space(1)))
-#else
-# define __user
-#endif
-
-/**
* struct ica_rsa_modexpo
*
* Requirements: