diff --git a/[refs] b/[refs] index 7fc01a3c76e6..5892f7aa9353 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db85905ad95b090941dc894b7f93f9f3818bdc07 +refs/heads/master: e2543c5ab299c67ddfb73a36eca4da6574259ab9 diff --git a/trunk/arch/arm/mach-shmobile/board-ap4evb.c b/trunk/arch/arm/mach-shmobile/board-ap4evb.c index 6c65b8b2cdf6..22e192574625 100644 --- a/trunk/arch/arm/mach-shmobile/board-ap4evb.c +++ b/trunk/arch/arm/mach-shmobile/board-ap4evb.c @@ -808,10 +808,7 @@ static struct platform_device fsi_ak4643_device = { static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq, unsigned long *parent_freq); -static struct sh_mobile_lcdc_info sh_mobile_lcdc1_info; - static struct sh_mobile_hdmi_info hdmi_info = { - .lcd_chan = &sh_mobile_lcdc1_info.ch[0], .flags = HDMI_SND_SRC_SPDIF, .clk_optimize_parent = ap4evb_clk_optimize, }; diff --git a/trunk/arch/arm/mach-shmobile/board-mackerel.c b/trunk/arch/arm/mach-shmobile/board-mackerel.c index 740f022fd7be..f275a817939c 100644 --- a/trunk/arch/arm/mach-shmobile/board-mackerel.c +++ b/trunk/arch/arm/mach-shmobile/board-mackerel.c @@ -427,10 +427,7 @@ static struct platform_device lcdc_device = { }; /* HDMI */ -static struct sh_mobile_lcdc_info hdmi_lcdc_info; - static struct sh_mobile_hdmi_info hdmi_info = { - .lcd_chan = &hdmi_lcdc_info.ch[0], .flags = HDMI_SND_SRC_SPDIF, };