From patchwork Sat Feb 13 16:02:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 45259 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 447A1B7D21 for ; Sun, 14 Feb 2010 03:03:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754813Ab0BMQCx (ORCPT ); Sat, 13 Feb 2010 11:02:53 -0500 Received: from mail-pz0-f197.google.com ([209.85.222.197]:64810 "EHLO mail-pz0-f197.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751544Ab0BMQCu (ORCPT ); Sat, 13 Feb 2010 11:02:50 -0500 Received: by mail-pz0-f197.google.com with SMTP id 35so187067pzk.33 for ; Sat, 13 Feb 2010 08:02:50 -0800 (PST) Received: by 10.143.153.38 with SMTP id f38mr1939114wfo.167.1266076964685; Sat, 13 Feb 2010 08:02:44 -0800 (PST) Received: from angua (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) by mx.google.com with ESMTPS id 22sm1816968pzk.1.2010.02.13.08.02.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 13 Feb 2010 08:02:43 -0800 (PST) Received: from [127.0.1.1] (unknown [IPv6:::1]) by angua (Postfix) with ESMTP id 761BEC64; Sat, 13 Feb 2010 09:02:42 -0700 (MST) From: Grant Likely Subject: [PATCH 3/9] of: protect linux/of.h with CONFIG_OF To: monstr@monstr.eu, sfr@canb.auug.org.au, benh@kernel.crashing.org, jeremy.kerr@canonical.com, davem@davemloft.net, microblaze-uclinux@itee.uq.edu.au, linuxppc-dev@ozlabs.org, sparclinux@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org Date: Sat, 13 Feb 2010 09:02:42 -0700 Message-ID: <20100213160242.4767.57641.stgit@angua> In-Reply-To: <20100213154838.4767.83881.stgit@angua> References: <20100213154838.4767.83881.stgit@angua> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Jeremy Kerr For platforms that have CONFIG_OF optional, we need to make the contents of linux/of.h conditional on CONFIG_OF. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt --- include/linux/of.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/of.h b/include/linux/of.h index 5c7b6a6..48b0ee6 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -22,6 +22,8 @@ #include +#ifdef CONFIG_OF + typedef u32 phandle; typedef u32 ihandle; @@ -194,4 +196,5 @@ extern void of_attach_node(struct device_node *); extern void of_detach_node(struct device_node *); #endif +#endif /* CONFIG_OF */ #endif /* _LINUX_OF_H */