- rtc-watchdog-support-for-rtc-m41t80-driver-take-3.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     rtc: watchdog support for rtc-m41t80 driver (take 3)
has been removed from the -mm tree.  Its filename was
     rtc-watchdog-support-for-rtc-m41t80-driver-take-3.patch

This patch was dropped because it was folded into rtc-watchdog-support-for-rtc-m41t80-driver-take-2.patch

------------------------------------------------------
Subject: rtc: watchdog support for rtc-m41t80 driver (take 3)
From: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>

* Move a Kconfig entry into "I2C RTC drivers" section


Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/rtc/Kconfig |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff -puN drivers/rtc/Kconfig~rtc-watchdog-support-for-rtc-m41t80-driver-take-3 drivers/rtc/Kconfig
--- a/drivers/rtc/Kconfig~rtc-watchdog-support-for-rtc-m41t80-driver-take-3
+++ a/drivers/rtc/Kconfig
@@ -224,6 +224,13 @@ config RTC_DRV_M41T80
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-m41t80.
 
+config RTC_DRV_M41T80_WDT
+	bool "ST M41T80 series RTC watchdog timer"
+	depends on RTC_DRV_M41T80
+	help
+	  If you say Y here you will get support for the
+	  watchdog timer in ST M41T80 RTC chips series.
+
 comment "SPI RTC drivers"
 	depends on RTC_CLASS && SPI_MASTER
 
@@ -293,13 +300,6 @@ config RTC_DRV_DS1742
 	  This driver can also be built as a module. If so, the module
 	  will be called rtc-ds1742.
 
-config RTC_DRV_M41T80_WDT
-	bool "ST M41T80 series RTC watchdog timer"
-	depends on RTC_DRV_M41T80
-	help
-	  If you say Y here you will get support for the
-	  watchdog timer in ST M41T80 RTC chips series.
-
 config RTC_DRV_M48T86
 	tristate "ST M48T86/Dallas DS12887"
 	depends on RTC_CLASS
_

Patches currently in -mm which might be from anemo@xxxxxxxxxxxxx are

git-kbuild.patch
git-mips.patch
mips-make-resources-for-ds1742-static-__initdata.patch
serial_txx9-fix-modem-control-line-handling.patch
serial_txx9-cleanup-includes.patch
spi_txx9-controller-driver.patch
rtc-add-rtc-m41t80-driver-take-2.patch
rtc-watchdog-support-for-rtc-m41t80-driver-take-2.patch
rtc-watchdog-support-for-rtc-m41t80-driver-take-3.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux