From patchwork Thu Nov 5 07:46:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 37735 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.176.167]) by ozlabs.org (Postfix) with ESMTP id B605AB7CC7 for ; Thu, 5 Nov 2009 18:46:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754685AbZKEHp6 (ORCPT ); Thu, 5 Nov 2009 02:45:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754741AbZKEHp6 (ORCPT ); Thu, 5 Nov 2009 02:45:58 -0500 Received: from mail-pw0-f42.google.com ([209.85.160.42]:59266 "EHLO mail-pw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754685AbZKEHp6 (ORCPT ); Thu, 5 Nov 2009 02:45:58 -0500 Received: by mail-pw0-f42.google.com with SMTP id 9so3727900pwj.21 for ; Wed, 04 Nov 2009 23:46:03 -0800 (PST) Received: by 10.114.249.17 with SMTP id w17mr4389418wah.85.1257407163485; Wed, 04 Nov 2009 23:46:03 -0800 (PST) Received: from angua (S01060002b3d79728.cg.shawcable.net [68.146.87.181]) by mx.google.com with ESMTPS id 20sm1061120pzk.9.2009.11.04.23.46.02 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 04 Nov 2009 23:46:02 -0800 (PST) Received: from [127.0.1.1] (unknown [IPv6:::1]) by angua (Postfix) with ESMTP id 13EAA11ED0; Thu, 5 Nov 2009 00:46:01 -0700 (MST) From: Grant Likely Subject: [PATCH 04/11] of/flattree: remove __init annotations from the header file To: linuxppc-dev@lists.ozlabs.org, devicetree-discuss@lists.ozlabs.org, benh@kernel.crashing.org, sfr@canb.auug.org.au, davem@davemloft.net, sparclinux@vger.kernel.org, monstr@monstr.eu, microblaze-uclinux@itee.uq.edu.au Date: Thu, 05 Nov 2009 00:46:01 -0700 Message-ID: <20091105074553.10460.2893.stgit@angua> In-Reply-To: <20091105073728.10460.6061.stgit@angua> References: <20091105073728.10460.6061.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 __init annotation belongs in the .c file, not the header. Signed-off-by: Grant Likely --- include/linux/of_fdt.h | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 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_fdt.h b/include/linux/of_fdt.h index d1a79f3..81231e0 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -62,15 +62,13 @@ extern struct boot_param_header *initial_boot_params; /* For scanning the flat device-tree at boot time */ extern char *find_flat_dt_string(u32 offset); -extern int __init of_scan_flat_dt(int (*it)(unsigned long node, - const char *uname, int depth, - void *data), - void *data); -extern void __init *of_get_flat_dt_prop(unsigned long node, const char *name, - unsigned long *size); -extern int __init of_flat_dt_is_compatible(unsigned long node, - const char *name); -extern unsigned long __init of_get_flat_dt_root(void); +extern int of_scan_flat_dt(int (*it)(unsigned long node, const char *uname, + int depth, void *data), + void *data); +extern void *of_get_flat_dt_prop(unsigned long node, const char *name, + unsigned long *size); +extern int of_flat_dt_is_compatible(unsigned long node, const char *name); +extern unsigned long of_get_flat_dt_root(void); /* Other Prototypes */ extern void finish_device_tree(void);