[GFS2] Fix up merge of Linus' kernel into GFS2

[pandora-kernel.git] / drivers / crypto / padlock.h

diff --git a/drivers/crypto/padlock.h b/drivers/crypto/padlock.h
index b78489b..b728e45 100644 (file)
--- a/drivers/crypto/padlock.h
+++ b/drivers/crypto/padlock.h
@@ -15,22 +15,9 @@
 
 #define PADLOCK_ALIGNMENT 16
 
-/* Control word. */
-struct cword {
-       unsigned int __attribute__ ((__packed__))
-               rounds:4,
-               algo:3,
-               keygen:1,
-               interm:1,
-               encdec:1,
-               ksize:2;
-} __attribute__ ((__aligned__(PADLOCK_ALIGNMENT)));
-
 #define PFX    "padlock: "
 
-#ifdef CONFIG_CRYPTO_DEV_PADLOCK_AES
-int padlock_init_aes(void);
-void padlock_fini_aes(void);
-#endif
+#define PADLOCK_CRA_PRIORITY   300
+#define PADLOCK_COMPOSITE_PRIORITY 400
 
 #endif /* _CRYPTO_PADLOCK_H */