diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/crypto/amcc | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/crypto/amcc')
| -rw-r--r-- | drivers/crypto/amcc/crypto4xx_sa.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/amcc/crypto4xx_sa.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/amcc/crypto4xx_sa.c b/drivers/crypto/amcc/crypto4xx_sa.c index 466fd94cd4a..de8a7a48775 100644 --- a/drivers/crypto/amcc/crypto4xx_sa.c +++ b/drivers/crypto/amcc/crypto4xx_sa.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | * @file crypto4xx_sa.c | 17 | * @file crypto4xx_sa.c |
| 18 | * | 18 | * |
| 19 | * This file implements the security context | 19 | * This file implements the security context |
| 20 | * assoicate format. | 20 | * associate format. |
| 21 | */ | 21 | */ |
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
diff --git a/drivers/crypto/amcc/crypto4xx_sa.h b/drivers/crypto/amcc/crypto4xx_sa.h index 4b83ed7e557..1352d58d4e3 100644 --- a/drivers/crypto/amcc/crypto4xx_sa.h +++ b/drivers/crypto/amcc/crypto4xx_sa.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * GNU General Public License for more details. | 15 | * GNU General Public License for more details. |
| 16 | * | 16 | * |
| 17 | * This file defines the security context | 17 | * This file defines the security context |
| 18 | * assoicate format. | 18 | * associate format. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #ifndef __CRYPTO4XX_SA_H__ | 21 | #ifndef __CRYPTO4XX_SA_H__ |