From patchwork Tue Jan 15 20:53:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Greer X-Patchwork-Id: 1981391 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B5B39DF264 for ; Tue, 15 Jan 2013 20:53:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756251Ab3AOUxM (ORCPT ); Tue, 15 Jan 2013 15:53:12 -0500 Received: from m1plsmtpa01-03.prod.mesa1.secureserver.net ([64.202.165.4]:36748 "EHLO m1plsmtpa01-03.prod.mesa1.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755012Ab3AOUxM (ORCPT ); Tue, 15 Jan 2013 15:53:12 -0500 Received: from blue.animalcreek.com ([68.3.93.7]) by m1plsmtpa01-03.prod.mesa1.secureserver.net with id oLtB1k00409Xvcc01LtBNC; Tue, 15 Jan 2013 13:53:11 -0700 Received: from blue.animalcreek.com (localhost [127.0.0.1]) by blue.animalcreek.com (Postfix) with ESMTP id 0140965A5D; Tue, 15 Jan 2013 13:53:11 -0700 (MST) From: "Mark A. Greer" To: herbert@gondor.apana.org.au Cc: davem@davemloft.net, linux-crypto@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, "Mark A. Greer" Subject: [PATCH] crypto: omap-sham - Fix compile errors when CONFIG_OF not defined Date: Tue, 15 Jan 2013 13:53:02 -0700 Message-Id: <1358283182-29392-1-git-send-email-mgreer@animalcreek.com> X-Mailer: git-send-email 1.7.12 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: "Mark A. Greer" Fix the compile errors created by commit 2545e8d (crypto: omap-sham - Add Device Tree Support) when CONFIG_OF is not defined. This includes changing omap_sham_get_res_dev() to omap_sham_get_res_of() and creating an empty version of omap_sham_of_match[]. Signed-off-by: Mark A. Greer --- drivers/crypto/omap-sham.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index edff981..dc2d354 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -1607,7 +1607,11 @@ err: 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;