Patch from Alon Bar-Lev <alon.barlev@gmail.com> to change KEY_FILE to

SUSPEND_KEY_FILE so that it doesn't conflict with  linux/input.h .

2 files changed, 2 insertions, 2 deletions

diff --git a/encrypt.h b/encrypt.h
index b17b7a7..9a5d8d5 100644
--- a/encrypt.h
+++ b/encrypt.h
@@ -58,5 +58,5 @@ void read_password(char *pass_buf, int vrfy);
 void encrypt_init(unsigned char *, unsigned char *, char *);
 void get_random_salt(unsigned char *salt, size_t size);
 
-#define KEY_FILE	"/etc/suspend.key"
+#define SUSPEND_KEY_FILE	"/etc/suspend.key"
 #endif
diff --git a/suspend.c b/suspend.c
index d6211a2..ae7457c 100644
--- a/suspend.c
+++ b/suspend.c
@@ -67,7 +67,7 @@ static long long compr_diff;
 #ifdef CONFIG_ENCRYPT
 static char do_encrypt;
 static char use_RSA;
-static char key_name[MAX_STR_LEN] = KEY_FILE;
+static char key_name[MAX_STR_LEN] = SUSPEND_KEY_FILE;
 static char password[PASS_SIZE];
 #else
 #define do_encrypt 0