8 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/cpu/armv7/tegra-common/ap20.c b/arch/arm/cpu/armv7/tegra-common/ap20.c
index 58405d49af3..4d141e9611d 100644
--- a/arch/arm/cpu/armv7/tegra-common/ap20.c
+++ b/arch/arm/cpu/armv7/tegra-common/ap20.c
@@ -23,7 +23,7 @@
 
 #include <asm/io.h>
 #include <asm/arch/tegra.h>
-#include <asm/arch/bitfield.h>
+#include <asm/arch-tegra/bitfield.h>
 #include <asm/arch/clk_rst.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/pmc.h>
diff --git a/arch/arm/cpu/armv7/tegra-common/clock.c b/arch/arm/cpu/armv7/tegra-common/clock.c
index d14fb5e0021..2d5a238c7a0 100644
--- a/arch/arm/cpu/armv7/tegra-common/clock.c
+++ b/arch/arm/cpu/armv7/tegra-common/clock.c
@@ -22,7 +22,7 @@
 /* Tegra2 Clock control functions */
 
 #include <asm/io.h>
-#include <asm/arch/bitfield.h>
+#include <asm/arch-tegra/bitfield.h>
 #include <asm/arch/clk_rst.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/timer.h>
diff --git a/arch/arm/cpu/armv7/tegra2/display.c b/arch/arm/cpu/armv7/tegra2/display.c
index 3871772369a..4fa4c7524d5 100644
--- a/arch/arm/cpu/armv7/tegra2/display.c
+++ b/arch/arm/cpu/armv7/tegra2/display.c
@@ -22,7 +22,7 @@
  */
 
 #include <asm/io.h>
-#include <asm/arch/bitfield.h>
+#include <asm/arch-tegra/bitfield.h>
 #include <asm/arch/clk_rst.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/timer.h>
diff --git a/arch/arm/cpu/armv7/tegra2/pinmux.c b/arch/arm/cpu/armv7/tegra2/pinmux.c
index f97e7d77997..f14c5ced625 100644
--- a/arch/arm/cpu/armv7/tegra2/pinmux.c
+++ b/arch/arm/cpu/armv7/tegra2/pinmux.c
@@ -22,7 +22,7 @@
 /* Tegra2 pin multiplexing functions */
 
 #include <asm/io.h>
-#include <asm/arch/bitfield.h>
+#include <asm/arch-tegra/bitfield.h>
 #include <asm/arch/tegra.h>
 #include <asm/arch/pinmux.h>
 #include <common.h>
diff --git a/arch/arm/cpu/armv7/tegra2/power.c b/arch/arm/cpu/armv7/tegra2/power.c
index 0f0e6748370..e3e1a970ce0 100644
--- a/arch/arm/cpu/armv7/tegra2/power.c
+++ b/arch/arm/cpu/armv7/tegra2/power.c
@@ -22,7 +22,7 @@
 /* Tegra2 power control functions */
 
 #include <asm/io.h>
-#include <asm/arch/bitfield.h>
+#include <asm/arch-tegra/bitfield.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/pmc.h>
 #include <asm/arch/power.h>
diff --git a/arch/arm/cpu/armv7/tegra2/pwfm.c b/arch/arm/cpu/armv7/tegra2/pwfm.c
index 1a37243fa47..079b401b2a5 100644
--- a/arch/arm/cpu/armv7/tegra2/pwfm.c
+++ b/arch/arm/cpu/armv7/tegra2/pwfm.c
@@ -22,7 +22,7 @@
 /* Tegra2 pulse width frequency modulator definitions */
 
 #include <asm/io.h>
-#include <asm/arch/bitfield.h>
+#include <asm/arch-tegra/bitfield.h>
 #include <asm/arch/pwfm.h>
 
 void pwfm_setup(struct pwfm_ctlr *pwfm, int enable, int pulse_width,
diff --git a/arch/arm/cpu/armv7/tegra2/warmboot.c b/arch/arm/cpu/armv7/tegra2/warmboot.c
index 6bcf30e771b..7a22a7c3ecf 100644
--- a/arch/arm/cpu/armv7/tegra2/warmboot.c
+++ b/arch/arm/cpu/armv7/tegra2/warmboot.c
@@ -28,7 +28,7 @@
 #include <asm/arch-tegra/ap20.h>
 #include <asm/arch-tegra/fuse.h>
 
-#include <asm/arch/bitfield.h>
+#include <asm/arch-tegra/bitfield.h>
 #include <asm/arch/clk_rst.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/emc.h>
diff --git a/arch/arm/include/asm/arch-tegra2/bitfield.h b/arch/arm/include/asm/arch-tegra/bitfield.h
index 771499cb38d..7e394f38006 100644
--- a/arch/arm/include/asm/arch-tegra2/bitfield.h
+++ b/arch/arm/include/asm/arch-tegra/bitfield.h
@@ -65,7 +65,7 @@
  *	writel(RegVal, UsbBase+USB_SUSP_CTRL);
  *	if(UsbBase == NV_ADDRESS_MAP_USB3_BASE)
  *	{
- *      	RegVal = readl(UsbBase+USB_SUSP_CTRL);
+ *		RegVal = readl(UsbBase+USB_SUSP_CTRL);
  *		RegVal |= Bit12;
  *		writel(RegVal, UsbBase+USB_SUSP_CTRL);
  *	}
@@ -125,13 +125,13 @@
  */
 #define bf_writel(field, value, reg) ({		\
 	u32 *__reg = (u32 *)(reg);			\
-	u32 __oldval = readl(__reg); 			\
+	u32 __oldval = readl(__reg);			\
 	bf_update(field, __oldval, value);		\
 	writel(__oldval, __reg);				\
 	})
 
 /* Unpacks a field from a register using readl */
-#define bf_readl(field, reg) 			\
+#define bf_readl(field, reg)			\
 	bf_unpack(field, readl(reg))
 
 /*