From: Marc Pignat <marc.pignat@hevs.ch>

Changes since v1:
 * patch against 2.6.27-rc1
 * removed device_init_wakeup(...) calls, they should be handled in i2c-core.c

Signed-off-by: Marc Pignat <marc.pignat@hevs.ch>
Cc: David Brownell <david-b@pacbell.net>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/rtc/rtc-ds1374.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff -puN drivers/rtc/rtc-ds1374.c~rtc-ds1374-wakeup-support-update drivers/rtc/rtc-ds1374.c
--- a/drivers/rtc/rtc-ds1374.c~rtc-ds1374-wakeup-support-update
+++ a/drivers/rtc/rtc-ds1374.c
@@ -388,7 +388,6 @@ static int ds1374_probe(struct i2c_clien
 			dev_err(&client->dev, "unable to request IRQ\n");
 			goto out_free;
 		}
-		device_init_wakeup(&client->dev, 1);
 	}
 
 	ds1374->rtc = rtc_device_register(client->name, &client->dev,
@@ -402,10 +401,9 @@ static int ds1374_probe(struct i2c_clien
 	return 0;
 
 out_irq:
-	if (client->irq > 0) {
-		device_init_wakeup(&client->dev, 0);
+	if (client->irq > 0)
 		free_irq(client->irq, client);
-	}
+
 out_free:
 	i2c_set_clientdata(client, NULL);
 	kfree(ds1374);
@@ -421,7 +419,6 @@ static int __devexit ds1374_remove(struc
 		ds1374->exiting = 1;
 		mutex_unlock(&ds1374->mutex);
 
-		device_init_wakeup(&client->dev, 0);
 		free_irq(client->irq, client);
 		flush_scheduled_work();
 	}
_