From 2401b1aa5a4aa34728610e79b6467d25a296189c Mon Sep 17 00:00:00 2001
From: Jingoo Han <jg1.han@samsung.com>
Date: Mon, 29 Apr 2013 16:18:33 -0700
Subject: [PATCH] --- yaml --- r: 365689 b: refs/heads/master c:
 6636a9944b9d3b6c4a0a27d5be5abc49ceca3381 h: refs/heads/master i:   365687:
 55442b624b5d139a11c1de006e6fc597137c7a10 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/rtc/class.c | 6 +++---
 trunk/include/linux/rtc.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5fadf2f9a5ce..231b488125e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2bf1151edcdb44e9e871e90e7331dc760c9f856
+refs/heads/master: 6636a9944b9d3b6c4a0a27d5be5abc49ceca3381
diff --git a/trunk/drivers/rtc/class.c b/trunk/drivers/rtc/class.c
index b72b40bd7805..66385402d20e 100644
--- a/trunk/drivers/rtc/class.c
+++ b/trunk/drivers/rtc/class.c
@@ -275,8 +275,8 @@ static int devm_rtc_device_match(struct device *dev, void *res, void *data)
 
 /**
  * devm_rtc_device_register - resource managed rtc_device_register()
- * @name: the name of the device
  * @dev: the device to register
+ * @name: the name of the device
  * @ops: the rtc operations structure
  * @owner: the module owner
  *
@@ -287,8 +287,8 @@ static int devm_rtc_device_match(struct device *dev, void *res, void *data)
  * for more information.
  */
 
-struct rtc_device *devm_rtc_device_register(const char *name,
-					struct device *dev,
+struct rtc_device *devm_rtc_device_register(struct device *dev,
+					const char *name,
 					const struct rtc_class_ops *ops,
 					struct module *owner)
 {
diff --git a/trunk/include/linux/rtc.h b/trunk/include/linux/rtc.h
index d9557689bb8d..c2c28975293c 100644
--- a/trunk/include/linux/rtc.h
+++ b/trunk/include/linux/rtc.h
@@ -133,8 +133,8 @@ extern struct rtc_device *rtc_device_register(const char *name,
 					struct device *dev,
 					const struct rtc_class_ops *ops,
 					struct module *owner);
-extern struct rtc_device *devm_rtc_device_register(const char *name,
-					struct device *dev,
+extern struct rtc_device *devm_rtc_device_register(struct device *dev,
+					const char *name,
 					const struct rtc_class_ops *ops,
 					struct module *owner);
 extern void rtc_device_unregister(struct rtc_device *rtc);