From 93db4a0add2d6f4dd2a8cbef15cdb86346dae169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20R=C3=B6jfors?= Date: Tue, 20 Jul 2010 15:26:53 -0700 Subject: [PATCH] --- yaml --- r: 207929 b: refs/heads/master c: b1a6f24394d44b7bd2c8ec3f301a5eda72ce462f h: refs/heads/master i: 207927: 57945eff8d0bc68cfc6088cccb0e3762cc2a15a7 v: v3 --- [refs] | 2 +- trunk/drivers/serial/timbuart.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9b023a883759..de335c45eb88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1917ac76e023339c73844bec775375b147f57ac7 +refs/heads/master: b1a6f24394d44b7bd2c8ec3f301a5eda72ce462f diff --git a/trunk/drivers/serial/timbuart.c b/trunk/drivers/serial/timbuart.c index 67ca642713b8..1f36b7eb7351 100644 --- a/trunk/drivers/serial/timbuart.c +++ b/trunk/drivers/serial/timbuart.c @@ -423,7 +423,7 @@ static struct uart_driver timbuart_driver = { .nr = 1 }; -static int timbuart_probe(struct platform_device *dev) +static int __devinit timbuart_probe(struct platform_device *dev) { int err, irq; struct timbuart_port *uart; @@ -489,7 +489,7 @@ static int timbuart_probe(struct platform_device *dev) return err; } -static int timbuart_remove(struct platform_device *dev) +static int __devexit timbuart_remove(struct platform_device *dev) { struct timbuart_port *uart = platform_get_drvdata(dev); @@ -507,7 +507,7 @@ static struct platform_driver timbuart_platform_driver = { .owner = THIS_MODULE, }, .probe = timbuart_probe, - .remove = timbuart_remove, + .remove = __devexit_p(timbuart_remove), }; /*--------------------------------------------------------------------------*/