From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 19 Mar 2009 12:39:58 +0000 (+0000)
Subject: Merge branch 'omap-clks3' into devel
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=14b6848bc0134b8838d374c423df3edda9b1490e;p=linux-2.6-omap-h63xx.git

Merge branch 'omap-clks3' into devel

Conflicts:

	arch/arm/mach-omap2/clock.c
---

14b6848bc0134b8838d374c423df3edda9b1490e
diff --cc arch/arm/mach-omap2/clock.c
index ce4d46a4a83,f49bce997a0..4247a153441
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@@ -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))