From 7545dc7c74a99755ade9f2983a773df84cd1c88a Mon Sep 17 00:00:00 2001 From: "Mark A. Greer" Date: Tue, 15 Jan 2013 13:53:02 -0700 Subject: [PATCH] --- yaml --- r: 357727 b: refs/heads/master c: c3c3b3292d202e9924fb3af0f4139848fd7e1de0 h: refs/heads/master i: 357725: fed11949dbf90b476bfc4a575d83cc2d84f20694 357723: 74f7599ffab624097a76d53cbdf646cc2c2dc48f 357719: 24e587c1da60dea6bd8bfd713e554845b2e3ea67 357711: 1989b3cbe313759b602ead253c5ad08578a72d45 357695: 6ac90d6dc5634ab09ce2fc5b061e6602d404aa3d v: v3 --- [refs] | 2 +- trunk/drivers/crypto/omap-sham.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c78b6375feba..df98f2517380 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78c37d191dd6899d8c219fee597a17d6e3c5d288 +refs/heads/master: c3c3b3292d202e9924fb3af0f4139848fd7e1de0 diff --git a/trunk/drivers/crypto/omap-sham.c b/trunk/drivers/crypto/omap-sham.c index edff981edfb1..dc2d354219c6 100644 --- a/trunk/drivers/crypto/omap-sham.c +++ b/trunk/drivers/crypto/omap-sham.c @@ -1607,7 +1607,11 @@ static int omap_sham_get_res_of(struct omap_sham_dev *dd, return err; } #else -static int omap_sham_get_res_dev(struct omap_sham_dev *dd, +static const struct of_device_id omap_sham_of_match[] = { + {}, +}; + +static int omap_sham_get_res_of(struct omap_sham_dev *dd, struct device *dev, struct resource *res) { return -EINVAL;