diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-06-21 11:13:27 +0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-06-21 11:13:27 +0400 |
| commit | 02c0241b600e4ab8a732c89749e252165145d60c (patch) | |
| tree | 16110074230e4061496b5af84222abff4acb309b /drivers/crypto/sahara.c | |
| parent | da5ffe11342a0ecf2cce7000a9392c9ca959e9c8 (diff) | |
| parent | fe6510b5d6349a8999b83ef7c5671e5a561b803a (diff) | |
| download | linux-02c0241b600e4ab8a732c89749e252165145d60c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto
Merge crypto to resolve conflict in crypto/Kconfig.
Diffstat (limited to 'drivers/crypto/sahara.c')
| -rw-r--r-- | drivers/crypto/sahara.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index a97bb6c1596c..c3dc1c04a5df 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c @@ -863,7 +863,7 @@ static struct of_device_id sahara_dt_ids[] = { { .compatible = "fsl,imx27-sahara" }, { /* sentinel */ } }; -MODULE_DEVICE_TABLE(platform, sahara_dt_ids); +MODULE_DEVICE_TABLE(of, sahara_dt_ids); static int sahara_probe(struct platform_device *pdev) { |