Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 273234
b: refs/heads/master
c: db5cf8d
h: refs/heads/master
v: v3
  • Loading branch information
Uwe Kleine-König authored and Linus Torvalds committed Nov 2, 2011
1 parent 6fea6ca commit 4bdab33
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 43fcb81550f7a16be192b19c77a379c9b27b1585
refs/heads/master: db5cf8d1ac4ac3fa06d89345154ce20068aeb097
6 changes: 3 additions & 3 deletions trunk/drivers/rtc/rtc-mc13xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ static irqreturn_t mc13xxx_rtc_reset_handler(int irq, void *dev)
return IRQ_HANDLED;
}

static int __devinit mc13xxx_rtc_probe(struct platform_device *pdev)
static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
{
int ret;
struct mc13xxx_rtc *priv;
Expand Down Expand Up @@ -378,7 +378,7 @@ static int __devinit mc13xxx_rtc_probe(struct platform_device *pdev)
return ret;
}

static int __devexit mc13xxx_rtc_remove(struct platform_device *pdev)
static int __exit mc13xxx_rtc_remove(struct platform_device *pdev)
{
struct mc13xxx_rtc *priv = platform_get_drvdata(pdev);

Expand Down Expand Up @@ -410,7 +410,7 @@ const struct platform_device_id mc13xxx_rtc_idtable[] = {

static struct platform_driver mc13xxx_rtc_driver = {
.id_table = mc13xxx_rtc_idtable,
.remove = __devexit_p(mc13xxx_rtc_remove),
.remove = __exit_p(mc13xxx_rtc_remove),
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
Expand Down

0 comments on commit 4bdab33

Please sign in to comment.