From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kumar Gala Subject: Re: [PATCH 2/8] powerpc/qe&cpm2: Avoid redefinitions in CPM2 and QE headers Date: Thu, 5 Nov 2009 07:46:33 -0600 Message-ID: References: <20091012164841.GA32214@oksana.dev.rtsoft.ru> <20091012164916.GB4578@oksana.dev.rtsoft.ru> Mime-Version: 1.0 (Apple Message framework v1076) Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Cc: David Brownell , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, spi-devel-general@lists.sourceforge.net, Andrew Morton To: Anton Vorontsov Return-path: In-Reply-To: <20091012164916.GB4578@oksana.dev.rtsoft.ru> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+glppd-linuxppc64-dev=m.gmane.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+glppd-linuxppc64-dev=m.gmane.org@lists.ozlabs.org List-Id: linux-spi.vger.kernel.org On Oct 12, 2009, at 11:49 AM, Anton Vorontsov wrote: > struct mcc defined in both immap_qe.h and immap_cpm2.h, so they will > conflic when included in a single file. The mcc struct is easy to deal > with, since it isn't used in any driver (yet), so let's just rename QE > version to qe_mcc. > > The ucb_ctlr is a bit trickier, since it is used by fsl_qe_udc driver, > and the driver supports both CPM and QE UDCs, plus the QE version is > used to form a bigger immap struct. > > I don't want to touch too much of USB code in this series, so for now > let's just copy most generic version into the common cpm.h header, > later we'll create cpm_usb.h where we'll place common USB structs that > are used by QE/CPM UDC and QE Host drivers (FHCI). > > And as for the structs in qe.h and cpm2.h, just prefix them with qe_ > and cpm_. > > Signed-off-by: Anton Vorontsov > --- > arch/powerpc/include/asm/cpm.h | 22 ++++++++++++++++++++++ > arch/powerpc/include/asm/immap_cpm2.h | 2 +- > arch/powerpc/include/asm/immap_qe.h | 8 ++++---- > 3 files changed, 27 insertions(+), 5 deletions(-) applied to next - k