Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / mcbsp.c

diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index cae3ebe249b3cdbacb18ece2b34e06aba82d17d5..1785d7a590c53b584a403a4e3e477dae2cbfd20c 100644 (file)
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -17,7 +17,9 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 
+#include <mach/irqs.h>
 #include <mach/dma.h>
+#include <mach/irqs.h>
 #include <mach/mux.h>
 #include <mach/cpu.h>
 #include <mach/mcbsp.h>
@@ -77,6 +79,7 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
                .clk = {
                        .name           = "mcbsp_clk",
                        .id             = 1,
+                       .clkdm          = { .name = "virt_opp_clkdm" },
                        .enable         = omap_mcbsp_clk_enable,
                        .disable        = omap_mcbsp_clk_disable,
                },
@@ -85,6 +88,7 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
                .clk = {
                        .name           = "mcbsp_clk",
                        .id             = 2,
+                       .clkdm          = { .name = "virt_opp_clkdm" },
                        .enable         = omap_mcbsp_clk_enable,
                        .disable        = omap_mcbsp_clk_disable,
                },
@@ -93,6 +97,7 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
                .clk = {
                        .name           = "mcbsp_clk",
                        .id             = 3,
+                       .clkdm          = { .name = "virt_opp_clkdm" },
                        .enable         = omap_mcbsp_clk_enable,
                        .disable        = omap_mcbsp_clk_disable,
                },
@@ -101,6 +106,7 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
                .clk = {
                        .name           = "mcbsp_clk",
                        .id             = 4,
+                       .clkdm          = { .name = "virt_opp_clkdm" },
                        .enable         = omap_mcbsp_clk_enable,
                        .disable        = omap_mcbsp_clk_disable,
                },
@@ -109,6 +115,7 @@ static struct mcbsp_internal_clk omap_mcbsp_clks[] = {
                .clk = {
                        .name           = "mcbsp_clk",
                        .id             = 5,
+                       .clkdm          = { .name = "virt_opp_clkdm" },
                        .enable         = omap_mcbsp_clk_enable,
                        .disable        = omap_mcbsp_clk_disable,
                },