Merge branch 'master' of /usr/src/ntfs-2.6/

[linux-2.6-omap-h63xx.git] / drivers / crypto / padlock.h

diff --git a/drivers/crypto/padlock.h b/drivers/crypto/padlock.h
index 3cf2b7a123487ce014fa074a22651bb77ea498ba..b78489bc298ac95d487de4bfaae06174fad5edf4 100644 (file)
--- a/drivers/crypto/padlock.h
+++ b/drivers/crypto/padlock.h
@@ -17,7 +17,7 @@
 
 /* Control word. */
 struct cword {
-       int __attribute__ ((__packed__))
+       unsigned int __attribute__ ((__packed__))
                rounds:4,
                algo:3,
                keygen:1,