Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6] / drivers / crypto / geode-aes.c

diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index da2d35db8b4898ae75a8e7bfe179047fdad972e5..0eb62841e9b0bd6f207bdb0c159709318919bff4 100644 (file)
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -8,7 +8,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/crypto.h>
@@ -97,7 +96,7 @@ do_crypt(void *src, void *dst, int len, u32 flags)
        return counter ? 0 : 1;
 }
 
-unsigned int
+static unsigned int
 geode_aes_crypt(struct geode_aes_op *op)
 {
 
@@ -457,7 +456,7 @@ static struct pci_driver geode_aes_driver = {
 static int __init
 geode_aes_init(void)
 {
-       return pci_module_init(&geode_aes_driver);
+       return pci_register_driver(&geode_aes_driver);
 }
 
 static void __exit