From: Tony Lindgren <tony@atomide.com>
Date: Sat, 12 Apr 2008 00:32:10 +0000 (-0700)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.25-omap1~23
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b87501204757e7c2deeddd94f4941b3e1dfd9a27;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
---

b87501204757e7c2deeddd94f4941b3e1dfd9a27
diff --cc drivers/rtc/Kconfig
index ee75f3ff5f3,02a4c8cf2b2..50189de2dbc
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@ -250,18 -250,9 +250,19 @@@ config RTC_DRV_TWL9233
  	  platforms.  The support is integrated with the rest of
  	  the Menelaus driver; it's not separate module.
  
 +config RTC_DRV_TWL4030
 +	tristate "OMAP TWL4030 Real Time Clock"
 +	depends on RTC_CLASS && TWL4030_CORE
 +	help
 +	  If you say yes here you get support for internal Real-Time 
 +	  Clock of TWL4030 chip.
 +
 +	  This driver can also be built as a module. If so, the module
 +	  will be called rtc-twl4030.
 +
  config RTC_DRV_S35390A
  	tristate "Seiko Instruments S-35390A"
+ 	select BITREVERSE
  	help
  	  If you say yes here you will get support for the Seiko
  	  Instruments S-35390A.