Commit f4220feb authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: mach-pxa: remove mach/memory.h 



Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent 3bc465aa

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -658,6 +658,7 @@ config ARCH_PXA 
	select SPARSE_IRQ

	select AUTO_ZRELADDR

	select MULTI_IRQ_HANDLER

	select NO_MACH_MEMORY_H

	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.

arch/arm/mach-pxa/include/mach/memory.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/*

 *  arch/arm/mach-pxa/include/mach/memory.h

 *

 * Author:	Nicolas Pitre

 * Copyright:	(C) 2001 MontaVista Software Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __ASM_ARCH_MEMORY_H

#define __ASM_ARCH_MEMORY_H



/*

 * Physical DRAM offset.

 */

#define PLAT_PHYS_OFFSET	UL(0xa0000000)



#endif

arch/arm/mach-pxa/z2.c

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static void z2_power_off(void) 
	 */

	PSPR = 0x0;

	local_irq_disable();

	pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET);

	pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PHYS_OFFSET - PAGE_OFFSET);

}

#else

#define z2_power_off   NULL