Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8785a8fb authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] pxa: move memory controller registers into pxa2xx-regs.h 



PXA3 has a different memory controller from PXA2 platforms.  Avoid
clashing definitions by moving the PXA2 definitions to pxa2xx-regs.h

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7664c400

arch/arm/mach-pxa/cpu-pxa.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


#include <asm/hardware.h>

#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>



#ifdef DEBUG

static unsigned int freq_debug;

arch/arm/mach-pxa/lpd270.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <asm/mach/flash.h>



#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/lpd270.h>

#include <asm/arch/audio.h>

#include <asm/arch/pxafb.h>

arch/arm/mach-pxa/lubbock.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <asm/hardware/sa1111.h>



#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/lubbock.h>

#include <asm/arch/udc.h>

#include <asm/arch/irda.h>

arch/arm/mach-pxa/mainstone.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <asm/mach/flash.h>



#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/mainstone.h>

#include <asm/arch/audio.h>

#include <asm/arch/pxafb.h>

arch/arm/mach-pxa/pxa27x.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/irq.h>

#include <asm/arch/irqs.h>

#include <asm/arch/pxa-regs.h>

#include <asm/arch/pxa2xx-regs.h>

#include <asm/arch/ohci.h>

#include <asm/arch/pm.h>

#include <asm/arch/dma.h>