3 files changed, 3 insertions, 72 deletions

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ff8c4beaace4..f21fe66c9eef 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -1,10 +1,10 @@
 menu "Hardware crypto devices"
 
 config CRYPTO_DEV_PADLOCK
-        tristate "Support for VIA PadLock ACE"
+        bool "Support for VIA PadLock ACE"
         depends on X86_32
         select CRYPTO_ALGAPI
-        default m
+        default y
         help
           Some VIA processors come with an integrated crypto engine
           (so called VIA PadLock ACE, Advanced Cryptography Engine)
@@ -14,16 +14,6 @@ config CRYPTO_DEV_PADLOCK
           The instructions are used only when the CPU supports them.
           Otherwise software encryption is used.
 
-          Selecting M for this option will compile a helper module
-          padlock.ko that should autoload all below configured
-          algorithms. Don't worry if your hardware does not support
-          some or all of them. In such case padlock.ko will
-          simply write a single line into the kernel log informing
-          about its failure but everything will keep working fine.
-
-          If you are unsure, say M. The compiled module will be
-          called padlock.ko
-
 config CRYPTO_DEV_PADLOCK_AES
         tristate "PadLock driver for AES algorithm"
         depends on CRYPTO_DEV_PADLOCK
@@ -55,7 +45,7 @@ source "arch/s390/crypto/Kconfig"
 
 config CRYPTO_DEV_GEODE
         tristate "Support for the Geode LX AES engine"
-        depends on CRYPTO && X86_32 && PCI
+        depends on X86_32 && PCI
         select CRYPTO_ALGAPI
         select CRYPTO_BLKCIPHER
         default m
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 6059cf869414..d070030f7d7e 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -1,4 +1,3 @@
-obj-$(CONFIG_CRYPTO_DEV_PADLOCK) += padlock.o
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_AES) += padlock-aes.o
 obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
 obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
diff --git a/drivers/crypto/padlock.c b/drivers/crypto/padlock.c
deleted file mode 100644
index d6d7dd5bb98c..000000000000
--- a/drivers/crypto/padlock.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Cryptographic API.
- *
- * Support for VIA PadLock hardware crypto engine.
- *
- * Copyright (c) 2006  Michal Ludvig <michal@logix.cz>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/crypto.h>
-#include <linux/cryptohash.h>
-#include <linux/interrupt.h>
-#include <linux/kernel.h>
-#include <linux/scatterlist.h>
-#include "padlock.h"
-
-static int __init padlock_init(void)
-{
-        int success = 0;
-
-        if (crypto_has_cipher("aes-padlock", 0, 0))
-                success++;
-
-        if (crypto_has_hash("sha1-padlock", 0, 0))
-                success++;
-
-        if (crypto_has_hash("sha256-padlock", 0, 0))
-                success++;
-
-        if (!success) {
-                printk(KERN_WARNING PFX "No VIA PadLock drivers have been loaded.\n");
-                return -ENODEV;
-        }
-
-        printk(KERN_NOTICE PFX "%d drivers are available.\n", success);
-
-        return 0;
-}
-
-static void __exit padlock_fini(void)
-{
-}
-
-module_init(padlock_init);
-module_exit(padlock_fini);
-
-MODULE_DESCRIPTION("Load all configured PadLock algorithms.");
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Michal Ludvig");
-