Skip to content

Commit

Permalink
staging: Fix SEP build
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Feb 13, 2012
1 parent 89ae7d7 commit ebb3bf5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions drivers/staging/sep/sep_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -4052,3 +4054,5 @@ void sep_crypto_takedown(void)

tasklet_kill(&sep_dev->finish_tasklet);
}

#endif
5 changes: 3 additions & 2 deletions drivers/staging/sep/sep_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit ebb3bf5

Please sign in to comment.