Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[net-next-2.6.git] / arch / arm / mach-pxa / include / mach / reset.h

diff --git a/include/asm-arm/arch-pxa/reset.h b/arch/arm/mach-pxa/include/mach/reset.h
similarity index 100%
rename from include/asm-arm/arch-pxa/reset.h
rename to arch/arm/mach-pxa/include/mach/reset.h