From: Tony Lindgren <tony@atomide.com>
Date: Tue, 24 Mar 2009 01:02:12 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=90e758af52ba803cba233fabee81176d99589f09;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/plat-omap/include/mach/common.h
	arch/arm/plat-omap/include/mach/pm.h
---

90e758af52ba803cba233fabee81176d99589f09
diff --cc arch/arm/plat-omap/include/mach/pm.h
index 15c19f0dbb5,37e2f0f38b4..faf5b48c61d
--- a/arch/arm/plat-omap/include/mach/pm.h
+++ b/arch/arm/plat-omap/include/mach/pm.h
@@@ -107,9 -107,8 +107,9 @@@
  #if     !defined(CONFIG_ARCH_OMAP730) && \
  	!defined(CONFIG_ARCH_OMAP15XX) && \
  	!defined(CONFIG_ARCH_OMAP16XX) && \
 -	!defined(CONFIG_ARCH_OMAP24XX)
 +	!defined(CONFIG_ARCH_OMAP24XX) && \
 +	!defined(CONFIG_ARCH_OMAP34XX)
- #error "Power management for this processor not implemented yet"
+ #warning "Power management for this processor not implemented yet"
  #endif
  
  #ifndef __ASSEMBLER__