diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/crypto/talitos.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/crypto/talitos.c')
| -rw-r--r-- | drivers/crypto/talitos.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index c47ffe8a73ef..dc558a097311 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/io.h> | 37 | #include <linux/io.h> |
| 38 | #include <linux/spinlock.h> | 38 | #include <linux/spinlock.h> |
| 39 | #include <linux/rtnetlink.h> | 39 | #include <linux/rtnetlink.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | #include <crypto/algapi.h> | 42 | #include <crypto/algapi.h> |
| 42 | #include <crypto/aes.h> | 43 | #include <crypto/aes.h> |
| @@ -1958,7 +1959,7 @@ err_out: | |||
| 1958 | return err; | 1959 | return err; |
| 1959 | } | 1960 | } |
| 1960 | 1961 | ||
| 1961 | static struct of_device_id talitos_match[] = { | 1962 | static const struct of_device_id talitos_match[] = { |
| 1962 | { | 1963 | { |
| 1963 | .compatible = "fsl,sec2.0", | 1964 | .compatible = "fsl,sec2.0", |
| 1964 | }, | 1965 | }, |