The patch titled
Subject: drivers/rtc/Kconfig: move DS2404 entry where it belongs
has been removed from the -mm tree. Its filename was
rtc-move-ds2404-entry-where-it-belongs.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Jean Delvare <jdelvare@xxxxxxx>
Subject: drivers/rtc/Kconfig: move DS2404 entry where it belongs
Move the DS2404 entry together with the other Dallas entries, and add
Maxim so that it looks nicer (and more correct, too.)
Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
Cc: Sven Schnelle <svens@xxxxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/Kconfig | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff -puN drivers/rtc/Kconfig~rtc-move-ds2404-entry-where-it-belongs drivers/rtc/Kconfig
--- a/drivers/rtc/Kconfig~rtc-move-ds2404-entry-where-it-belongs
+++ a/drivers/rtc/Kconfig
@@ -760,6 +760,15 @@ 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_DS2404
+ tristate "Maxim/Dallas DS2404"
+ help
+ If you say yes here you get support for the
+ Dallas DS2404 RTC chip.
+
+ This driver can also be built as a module. If so, the module
+ will be called rtc-ds2404.
+
config RTC_DRV_DA9052
tristate "Dialog DA9052/DA9053 RTC"
depends on PMIC_DA9052
@@ -873,15 +882,6 @@ config RTC_DRV_V3020
This driver can also be built as a module. If so, the module
will be called rtc-v3020.
-config RTC_DRV_DS2404
- tristate "Dallas DS2404"
- help
- If you say yes here you get support for the
- Dallas DS2404 RTC chip.
-
- This driver can also be built as a module. If so, the module
- will be called rtc-ds2404.
-
config RTC_DRV_WM831X
tristate "Wolfson Microelectronics WM831x RTC"
depends on MFD_WM831X
_
Patches currently in -mm which might be from jdelvare@xxxxxxx are
origin.patch
linux-next.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
