Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / omap1510.h

diff --git a/include/configs/omap1510.h b/include/configs/omap1510.h
index 6787b1928a4c68d2fb66357f8eb77ce9796b4902..e6d9c7aa79cf608cac88f16bd5461ea95b33933d 100644 (file)
--- a/include/configs/omap1510.h
+++ b/include/configs/omap1510.h
@@ -28,7 +28,7 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <asm/arch/sizes.h>
+#include <asm/sizes.h>
 
 /*
   There are 2 sets of general I/O -->
@@ -482,7 +482,7 @@
 /*  CNTL_TIMER register bits */
 #define MPUTIM_FREE            (1<<6)
 #define MPUTIM_CLOCK_ENABLE    (1<<5)
-#define MPUTIM_PTV_MASK                (0x7<<PTV_BIT)
+#define MPUTIM_PTV_MASK                (0x7<<MPUTIM_PTV_BIT)
 #define MPUTIM_PTV_BIT         2
 #define MPUTIM_AR              (1<<1)
 #define MPUTIM_ST              (1<<0)