diff --git a/[refs] b/[refs]
index ccac5b8f4144..37939ce25e3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f821eece8b1bb10ad2d76c026e02257ce5c3c439
+refs/heads/master: 5167255cae4c10b1acb20fb41ab10e9d5de708c7
diff --git a/trunk/arch/arm/plat-omap/include/plat/mcbsp.h b/trunk/arch/arm/plat-omap/include/plat/mcbsp.h
index 9802055b0a80..5d657d96269d 100644
--- a/trunk/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/trunk/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -25,9 +25,7 @@
 #define __ASM_ARCH_OMAP_MCBSP_H
 
 #include <linux/spinlock.h>
-
-#include <mach/hardware.h>
-#include <plat/clock.h>
+#include <linux/clk.h>
 
 /* macro for building platform_device for McBSP ports */
 #define OMAP_MCBSP_PLATFORM_DEVICE(port_nr)		\