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

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / include / mach / hardware.h

diff --git a/include/asm-arm/arch-pxa/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h
similarity index 99%
rename from include/asm-arm/arch-pxa/hardware.h
rename to arch/arm/mach-pxa/include/mach/hardware.h
index 351d0a721769ed2745a78628004a83d2415d57aa..e89df4d0d23999278dfdab688ed76aa3ecfc07d9 100644 (file)
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/arch/arm/mach-pxa/include/mach/hardware.h
@@ -1,5 +1,5 @@
 /*
- *  linux/include/asm-arm/arch-pxa/hardware.h
+ *  arch/arm/mach-pxa/include/mach/hardware.h
  *
  *  Author:    Nicolas Pitre
  *  Created:   Jun 15, 2001