Merge branch 'omap-clks3' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 19 Mar 2009 12:39:58 +0000 (12:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 19 Mar 2009 12:39:58 +0000 (12:39 +0000)
Conflicts:

arch/arm/mach-omap2/clock.c

1  2 
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/clock.c
drivers/mmc/host/omap_hsmmc.c

Simple merge
@@@ -576,8 -674,8 +674,8 @@@ u32 omap2_divisor_to_clksel(struct clk 
        WARN_ON(div == 0);
  
        clks = omap2_get_clksel_by_parent(clk, clk->parent);
-       if (clks == NULL)
+       if (!clks)
 -              return 0;
 +              return ~0;
  
        for (clkr = clks->rates; clkr->div; clkr++) {
                if ((clkr->flags & cpu_mask) && (clkr->div == div))
Simple merge