diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/crypto/amcc | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/crypto/amcc')
| -rw-r--r-- | drivers/crypto/amcc/crypto4xx_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c index 46e899ac924e..1c3849f6b7a2 100644 --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c | |||
| @@ -1274,7 +1274,7 @@ static int __exit crypto4xx_remove(struct of_device *ofdev) | |||
| 1274 | return 0; | 1274 | return 0; |
| 1275 | } | 1275 | } |
| 1276 | 1276 | ||
| 1277 | static struct of_device_id crypto4xx_match[] = { | 1277 | static const struct of_device_id crypto4xx_match[] = { |
| 1278 | { .compatible = "amcc,ppc4xx-crypto",}, | 1278 | { .compatible = "amcc,ppc4xx-crypto",}, |
| 1279 | { }, | 1279 | { }, |
| 1280 | }; | 1280 | }; |