From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752976AbbCWPR1 (ORCPT <rfc822;w@1wt.eu>);
	Mon, 23 Mar 2015 11:17:27 -0400
Received: from service87.mimecast.com ([91.220.42.44]:43845 "EHLO
	service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752106AbbCWPRZ convert rfc822-to-8bit (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 23 Mar 2015 11:17:25 -0400
Message-ID: <55102E82.1080404@arm.com>
Date: Mon, 23 Mar 2015 15:17:22 +0000
From: "Suzuki K. Poulose" <Suzuki.Poulose@arm.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0
MIME-Version: 1.0
To: Valentin Rothberg <valentinrothberg@gmail.com>,
        "linux@arm.linux.org.uk" <linux@arm.linux.org.uk>
CC: Sudeep Holla <Sudeep.Holla@arm.com>,
        "nicolas.pitre@linaro.org" <nicolas.pitre@linaro.org>,
        Punit Agrawal <Punit.Agrawal@arm.com>,
        Will Deacon <Will.Deacon@arm.com>,
        "linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>,
        "linux-samsung-soc@vger.kernel.org" 
	<linux-samsung-soc@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Paul Bolle <pebolle@tiscali.nl>,
        Andreas Ruprecht <rupran@einserver.de>,
        hengelein Stefan <stefan.hengelein@fau.de>
Subject: Re: Renaming ARM_CCI
References: <CAD3Xx4+ECHuri6nT7=gpM5EnAqZM2zW8TK4T0yjW+aMMz=pwdA@mail.gmail.com>
In-Reply-To: <CAD3Xx4+ECHuri6nT7=gpM5EnAqZM2zW8TK4T0yjW+aMMz=pwdA@mail.gmail.com>
X-OriginalArrivalTime: 23 Mar 2015 15:17:21.0553 (UTC) FILETIME=[7581B810:01D0657C]
X-MC-Unique: 115032315172301701
Content-Type: text/plain; charset=WINDOWS-1252; format=flowed
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.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