From: Tony Lindgren <tony@atomide.com>
Date: Wed, 5 Mar 2008 08:33:15 +0000 (+0200)
Subject: Merge current mainline tree into linux-omap tree
X-Git-Tag: v2.6.25-omap1~154
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e2fbfd6bd4e61fbfc94c95420df63e1b10862a3c;p=linux-2.6-omap-h63xx.git

Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/rtc/Kconfig
---

e2fbfd6bd4e61fbfc94c95420df63e1b10862a3c
diff --cc drivers/rtc/Kconfig
index 36cfca31769,82f5ad9c3af..0cdeb11a9cb
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@@ -250,16 -250,15 +250,25 @@@ 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"
+ 	help
+ 	  If you say yes here you will get support for the Seiko
+ 	  Instruments S-35390A.
+ 
+ 	  This driver can also be built as a module. If so the module
+ 	  will be called rtc-s35390a.
+ 
  endif # I2C
  
  comment "SPI RTC drivers"