am 49dd24c2: am 1dc1fb4a: Merge "vold: suppress unused argument warning messages"

* commit '49dd24c238e86c57e97f919af7fbf8ee3d79b737':
  vold: suppress unused argument warning messages
diff --git a/cryptfs.c b/cryptfs.c
index 40ad36a..8c13e04 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -53,6 +53,8 @@
 
 #define UNUSED __attribute__((unused))
 
+#define UNUSED __attribute__((unused))
+
 #define DM_CRYPT_BUF_SIZE 4096
 
 #define HASH_COUNT 2000