Re: linux-next: build failure after merge of the crypto tree

From: Herbert Xu
Date: Tue Mar 17 2015 - 07:12:01 EST


On Tue, Mar 17, 2015 at 01:01:04PM +1100, Stephen Rothwell wrote:
>
> After merging the crypto tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/crypto/img-hash.c: At top level:
> drivers/crypto/img-hash.c:878:1: error: expected ',' or ';' before 'static'
> static int img_hash_probe(struct platform_device *pdev)
> ^
>
> Caused by commit d358f1abbf71 ("crypto: img-hash - Add Imagination
> Technologies hw hash accelerator").

Thanks for the report Stephen, I'll merge this patch to fix it.

---8<---
imghash: Add missing semicolon to fix build error

There is a missing semicolon after MODULE_DEVICE_TABLE.

Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>

diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c
index 0274172..fec61fc 100644
--- a/drivers/crypto/img-hash.c
+++ b/drivers/crypto/img-hash.c
@@ -873,7 +873,7 @@ static const struct of_device_id img_hash_match[] = {
{ .compatible = "img,hash-accelerator" },
{}
};
-MODULE_DEVICE_TABLE(of, img_hash_match)
+MODULE_DEVICE_TABLE(of, img_hash_match);

static int img_hash_probe(struct platform_device *pdev)
{

--
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/