diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 18:25:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 18:25:18 -0500 |
| commit | 9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6 (patch) | |
| tree | 9216a285bfe23aa799ca6efa01a3f4063d798e64 /drivers | |
| parent | 4387ff75f29412a234d394b0276c2b239d3d3844 (diff) | |
| parent | dc2e2f33bbf07344995357314fd8887f6564dba7 (diff) | |
Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Conflicts:
crypto/Kconfig
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/geode-aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c index 43a68398656f..31ea405f2eeb 100644 --- a/drivers/crypto/geode-aes.c +++ b/drivers/crypto/geode-aes.c | |||
| @@ -457,7 +457,7 @@ static struct pci_driver geode_aes_driver = { | |||
| 457 | static int __init | 457 | static int __init |
| 458 | geode_aes_init(void) | 458 | geode_aes_init(void) |
| 459 | { | 459 | { |
| 460 | return pci_module_init(&geode_aes_driver); | 460 | return pci_register_driver(&geode_aes_driver); |
| 461 | } | 461 | } |
| 462 | 462 | ||
| 463 | static void __exit | 463 | static void __exit |