From: Alan Cox <alan@linux.intel.com>
Date: Mon, 13 Feb 2012 22:37:20 +0000 (+0000)
Subject: staging: Fix SEP build
X-Git-Tag: MMI-PSA29.97-13-9~17268^2~173
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ebb3bf50183f41327341da6f1e82b1fe1c058c12;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging: Fix SEP build

SEP build fails if crypto is not selected.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/sep/sep_crypto.c b/drivers/staging/sep/sep_crypto.c
index 89b6814c70af..1cc790e9fa07 100644
--- a/drivers/staging/sep/sep_crypto.c
+++ b/drivers/staging/sep/sep_crypto.c
@@ -74,6 +74,8 @@
 #include "sep_dev.h"
 #include "sep_crypto.h"
 
+#if defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE)
+
 /* Globals for queuing */
 static spinlock_t queue_lock;
 static struct crypto_queue sep_queue;
@@ -4052,3 +4054,5 @@ void sep_crypto_takedown(void)
 
 	tasklet_kill(&sep_dev->finish_tasklet);
 }
+
+#endif
diff --git a/drivers/staging/sep/sep_main.c b/drivers/staging/sep/sep_main.c
index cf420f6bbe15..ad54c2e5c932 100644
--- a/drivers/staging/sep/sep_main.c
+++ b/drivers/staging/sep/sep_main.c
@@ -4245,7 +4245,7 @@ static int __devinit sep_probe(struct pci_dev *pdev,
 	sep->power_save_setup = 1;
 #endif
 	/* register kernel crypto driver */
-#if defined(CONFIG_CRYPTO)
+#if defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE)
 	error = sep_crypto_setup();
 	if (error) {
 		dev_err(&sep->pdev->dev, "crypto setup failed\n");
@@ -4292,8 +4292,9 @@ static void sep_remove(struct pci_dev *pdev)
 	misc_deregister(&sep->miscdev_sep);
 
 	/* Unregister from kernel crypto */
+#if defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE)
 	sep_crypto_takedown();
-
+#endif
 	/* Free the irq */
 	free_irq(sep->pdev->irq, sep);