Merge branch 'x86/urgent' into x86/cpu, to pick up dependency

[linux-2.6-microblaze.git] / drivers / rtc / rtc-pcf8563.c

diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index c8f95b8..b9ddbb0 100644 (file)
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -23,8 +23,6 @@
 #include <linux/of.h>
 #include <linux/err.h>
 
-#define DRV_VERSION "0.4.4"
-
 #define PCF8563_REG_ST1                0x00 /* status */
 #define PCF8563_REG_ST2                0x01
 #define PCF8563_BIT_AIE                (1 << 1)
@@ -535,7 +533,7 @@ static struct clk *pcf8563_clkout_register_clk(struct pcf8563 *pcf8563)
 
        init.name = "pcf8563-clkout";
        init.ops = &pcf8563_clkout_ops;
-       init.flags = CLK_IS_ROOT;
+       init.flags = 0;
        init.parent_names = NULL;
        init.num_parents = 0;
        pcf8563->clkout_hw.init = &init;
@@ -580,8 +578,6 @@ static int pcf8563_probe(struct i2c_client *client,
        if (!pcf8563)
                return -ENOMEM;
 
-       dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
-
        i2c_set_clientdata(client, pcf8563);
        pcf8563->client = client;
        device_set_wakeup_capable(&client->dev, 1);
@@ -662,4 +658,3 @@ module_i2c_driver(pcf8563_driver);
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
 MODULE_DESCRIPTION("Philips PCF8563/Epson RTC8564 RTC driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);