From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752776AbbJFP7c (ORCPT ); Tue, 6 Oct 2015 11:59:32 -0400 Received: from rcdn-iport-7.cisco.com ([173.37.86.78]:36307 "EHLO rcdn-iport-7.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751460AbbJFP7a (ORCPT ); Tue, 6 Oct 2015 11:59:30 -0400 X-Greylist: delayed 710 seconds by postgrey-1.27 at vger.kernel.org; Tue, 06 Oct 2015 11:59:30 EDT X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0D9AQDV7BNW/4UNJK1egyeBQroChCIBDYFahhqBODgUAQEBAQEBAYEKhCd9gT4BEoguv1wBAQEBAQUCAR8LhmiJJmWENQWNfogGjRebbh8BAUKEIh4zhnaBSQEBAQ X-IronPort-AV: E=Sophos;i="5.17,644,1437436800"; d="scan'208";a="33120104" From: Daniel Walker To: xe-kernel@external.cisco.com, Rob Herring , Frank Rowand , Grant Likely Cc: Daniel Walker , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH-RFC 6/7] drivers: of: ifdef out cmdline section Date: Tue, 6 Oct 2015 08:47:13 -0700 Message-Id: <1444146434-12776-6-git-send-email-danielwa@cisco.com> X-Mailer: git-send-email 2.1.4 X-Auto-Response-Suppress: DR, OOF, AutoReply Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It looks like there's some seepage of cmdline stuff into the generic device tree code. This conflicts with the generic cmdline implementation so I remove it in the case when that's enabled. Cc: xe-kernel@external.cisco.com Cc: Daniel Walker Signed-off-by: Daniel Walker --- drivers/of/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 6e82bc42..80f1e48 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -953,7 +953,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, * managed to set the command line, unless CONFIG_CMDLINE_FORCE * is set in which case we override whatever was found earlier. */ -#ifdef CONFIG_CMDLINE +#if defined(CONFIG_CMDLINE) && !defined(CONFIG_GENERIC_CMDLINE) #ifndef CONFIG_CMDLINE_FORCE if (!((char *)data)[0]) #endif -- 2.1.4