On Aug 18, 2009, at 5:04 PM, 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 <[email protected]> > --- > 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 ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ spi-devel-general mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/spi-devel-general
