From patchwork Mon Dec 19 19:24:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 132297 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 10008B7007 for ; Tue, 20 Dec 2011 06:24:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752077Ab1LSTY1 (ORCPT ); Mon, 19 Dec 2011 14:24:27 -0500 Received: from avon.wwwdotorg.org ([70.85.31.133]:57048 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751828Ab1LSTY1 (ORCPT ); Mon, 19 Dec 2011 14:24:27 -0500 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id 6945E6343; Mon, 19 Dec 2011 12:24:41 -0700 (MST) Received: from localhost.localdomain (searspoint.nvidia.com [216.228.112.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id 63D15E40F4; Mon, 19 Dec 2011 12:24:22 -0700 (MST) From: Stephen Warren To: Olof Johansson , Colin Cross Cc: Peter De Schrijver , linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stephen Warren Subject: [PATCH 3/3] arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF Date: Mon, 19 Dec 2011 12:24:05 -0700 Message-Id: <1324322645-30653-3-git-send-email-swarren@nvidia.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1324322645-30653-1-git-send-email-swarren@nvidia.com> References: <1324322645-30653-1-git-send-email-swarren@nvidia.com> X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.96.5 at avon.wwwdotorg.org X-Virus-Status: Clean Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org This fixes a build break attempting to build a Tegra20-only kernel without device tree enabled. Signed-off-by: Stephen Warren --- arch/arm/mach-tegra/common.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 864dc97..a2eb901 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -33,6 +33,7 @@ #include "clock.h" #include "fuse.h" +#ifdef CONFIG_OF static const struct of_device_id tegra_dt_irq_match[] __initconst = { { .compatible = "arm,cortex-a9-gic", .data = gic_of_init }, { } @@ -43,6 +44,7 @@ void __init tegra_dt_init_irq(void) tegra_init_irq(); of_irq_init(tegra_dt_irq_match); } +#endif void tegra_assert_system_reset(char mode, const char *cmd) {