Merge branch 'battery' into release

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-pxa / include / mach / pxa300.h

diff --git a/arch/arm/mach-pxa/include/mach/pxa300.h b/arch/arm/mach-pxa/include/mach/pxa300.h
index 2f33076c9e4813e5e27009007b7b7f1e3f7a24dc..733b6412c3df7ba52e09b9f12683aaa940c6ddf5 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/pxa300.h
+++ b/arch/arm/mach-pxa/include/mach/pxa300.h
@@ -1,8 +1,7 @@
 #ifndef __MACH_PXA300_H
 #define __MACH_PXA300_H
 
-#include <mach/hardware.h>
-#include <mach/pxa3xx-regs.h>
+#include <mach/pxa3xx.h>
 #include <mach/mfp-pxa300.h>
 
 #endif /* __MACH_PXA300_H */