Merge remote branch 'wireless-next/master' into ath6kl-next

[~andy/linux] / arch / arm / mach-omap1 / clock.h

diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h
index 16b1423b454a32dea7197460a393b12a4bd4e2b0..3d04f4f67676280a591f7bbcfb003c426fdba2dc 100644 (file)
--- a/arch/arm/mach-omap1/clock.h
+++ b/arch/arm/mach-omap1/clock.h
@@ -111,4 +111,7 @@ extern const struct clkops clkops_dummy;
 extern const struct clkops clkops_uart_16xx;
 extern const struct clkops clkops_generic;
 
+/* used for passing SoC type to omap1_{select,round_to}_table_rate() */
+extern u32 cpu_mask;
+
 #endif