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

Commit 82b95ecb authored Sep 10, 2009 by Haojian Zhuang Committed by Eric Miao Dec 01, 2009

pxa3xx_nand: move pxa3xx_nand.h common into plat directory



Since the same nand controller is shared between ARCH_PXA and ARCH_MMP. Move
the pxa3xx_nand.h from mach directory to plat directoy.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: David Woodhouse <david.woodhouse@intel.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

parent 171d0fbe

arch/arm/mach-pxa/cm-x300.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@
	#include <mach/mmc.h>		#include <mach/mmc.h>
	#include <mach/ohci.h>		#include <mach/ohci.h>
	#include <plat/i2c.h>		#include <plat/i2c.h>
	#include <mach/pxa3xx_nand.h>		#include <plat/pxa3xx_nand.h>

	#include <asm/mach/map.h>		#include <asm/mach/map.h>

arch/arm/mach-pxa/colibri-pxa3xx.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@
	#include <mach/colibri.h>		#include <mach/colibri.h>
	#include <mach/mmc.h>		#include <mach/mmc.h>
	#include <mach/pxafb.h>		#include <mach/pxafb.h>
	#include <mach/pxa3xx_nand.h>		#include <plat/pxa3xx_nand.h>

	#include "generic.h"		#include "generic.h"
	#include "devices.h"		#include "devices.h"

arch/arm/mach-pxa/devices.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8,13 +8,13 @@
	#include <mach/pxafb.h>		#include <mach/pxafb.h>
	#include <mach/mmc.h>		#include <mach/mmc.h>
	#include <mach/irda.h>		#include <mach/irda.h>
	#include <plat/i2c.h>
	#include <mach/ohci.h>		#include <mach/ohci.h>
	#include <mach/pxa27x_keypad.h>		#include <mach/pxa27x_keypad.h>
	#include <mach/pxa2xx_spi.h>		#include <mach/pxa2xx_spi.h>
	#include <mach/camera.h>		#include <mach/camera.h>
	#include <mach/audio.h>		#include <mach/audio.h>
	#include <mach/pxa3xx_nand.h>		#include <plat/i2c.h>
			#include <plat/pxa3xx_nand.h>

	#include "devices.h"		#include "devices.h"
	#include "generic.h"		#include "generic.h"

arch/arm/mach-pxa/littleton.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -44,10 +44,10 @@
	#include <mach/ssp.h>		#include <mach/ssp.h>
	#include <mach/mmc.h>		#include <mach/mmc.h>
	#include <mach/pxa2xx_spi.h>		#include <mach/pxa2xx_spi.h>
	#include <plat/i2c.h>
	#include <mach/pxa27x_keypad.h>		#include <mach/pxa27x_keypad.h>
	#include <mach/pxa3xx_nand.h>
	#include <mach/littleton.h>		#include <mach/littleton.h>
			#include <plat/i2c.h>
			#include <plat/pxa3xx_nand.h>

	#include "generic.h"		#include "generic.h"

arch/arm/mach-pxa/zylonite.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@
	#include <mach/mmc.h>		#include <mach/mmc.h>
	#include <mach/ohci.h>		#include <mach/ohci.h>
	#include <mach/pxa27x_keypad.h>		#include <mach/pxa27x_keypad.h>
	#include <mach/pxa3xx_nand.h>		#include <plat/pxa3xx_nand.h>

	#include "devices.h"		#include "devices.h"
	#include "generic.h"		#include "generic.h"