From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Suzuki K. Poulose" Subject: Re: Renaming ARM_CCI Date: Mon, 23 Mar 2015 15:17:22 +0000 Message-ID: <55102E82.1080404@arm.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=WINDOWS-1252; format=flowed Content-Transfer-Encoding: 8BIT Return-path: Received: from service87.mimecast.com ([91.220.42.44]:43846 "EHLO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752135AbbCWPRZ convert rfc822-to-8bit (ORCPT ); Mon, 23 Mar 2015 11:17:25 -0400 In-Reply-To: Sender: linux-samsung-soc-owner@vger.kernel.org List-Id: linux-samsung-soc@vger.kernel.org To: Valentin Rothberg , "linux@arm.linux.org.uk" Cc: Sudeep Holla , "nicolas.pitre@linaro.org" , Punit Agrawal , Will Deacon , "linux-arm-kernel@lists.infradead.org" , "linux-samsung-soc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Paul Bolle , Andreas Ruprecht , hengelein Stefan On 23/03/15 15:10, Valentin Rothberg wrote: > Hi Suzuki, > > your commit c9966c98697a ("arm-cci: Split the code for PMU vs driver > support") renames the Kconfig option ARM_CCI to ARM_CCI400_PORT_CTRL. > However, the commit does not rename all references on ARM_CCI: > It renames, but still, leaves the ARM_CCI to build the arm-cci.o, which is in the original commit. > drivers/bus/Kconfig:29: select ARM_CCI > drivers/bus/Makefile:6:obj-$(CONFIG_ARM_CCI) += arm-cci.o > include/linux/arm-cci.h:31:#ifdef CONFIG_ARM_CCI > > Is this intentional or is there a patch scheduled somewhere to fix this issue? Yes, it is. This problem was introduced due to a conflict in the linux-next. See : https://lkml.org/lkml/2015/3/22/240 Cheers Suzuki From mboxrd@z Thu Jan 1 00:00:00 1970 From: Suzuki.Poulose@arm.com (Suzuki K. Poulose) Date: Mon, 23 Mar 2015 15:17:22 +0000 Subject: Renaming ARM_CCI In-Reply-To: References: Message-ID: <55102E82.1080404@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 23/03/15 15:10, Valentin Rothberg wrote: > Hi Suzuki, > > your commit c9966c98697a ("arm-cci: Split the code for PMU vs driver > support") renames the Kconfig option ARM_CCI to ARM_CCI400_PORT_CTRL. > However, the commit does not rename all references on ARM_CCI: > It renames, but still, leaves the ARM_CCI to build the arm-cci.o, which is in the original commit. > drivers/bus/Kconfig:29: select ARM_CCI > drivers/bus/Makefile:6:obj-$(CONFIG_ARM_CCI) += arm-cci.o > include/linux/arm-cci.h:31:#ifdef CONFIG_ARM_CCI > > Is this intentional or is there a patch scheduled somewhere to fix this issue? Yes, it is. This problem was introduced due to a conflict in the linux-next. See : https://lkml.org/lkml/2015/3/22/240 Cheers Suzuki