From 086aec860f4478dad0de4d985d88745e0f2e4b78 Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Mon, 18 Mar 2013 19:19:07 -0400 Subject: [PATCH] --- yaml --- r: 361421 b: refs/heads/master c: 9997d08806062cb7ba471ab12fa2742cfec2f413 h: refs/heads/master i: 361419: c4f1c5a04155e5fa18c751411fc5c178f4afe0dd v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/85xx/sgy_cts1000.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 71d4ad8dc4b7..d68081efd94a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b63dc123b20e54a306ff1bfa191e511c506ee331 +refs/heads/master: 9997d08806062cb7ba471ab12fa2742cfec2f413 diff --git a/trunk/arch/powerpc/platforms/85xx/sgy_cts1000.c b/trunk/arch/powerpc/platforms/85xx/sgy_cts1000.c index 611e92f291c4..7179726ba5c5 100644 --- a/trunk/arch/powerpc/platforms/85xx/sgy_cts1000.c +++ b/trunk/arch/powerpc/platforms/85xx/sgy_cts1000.c @@ -69,7 +69,7 @@ static irqreturn_t gpio_halt_irq(int irq, void *__data) return IRQ_HANDLED; }; -static int __devinit gpio_halt_probe(struct platform_device *pdev) +static int gpio_halt_probe(struct platform_device *pdev) { enum of_gpio_flags flags; struct device_node *node = pdev->dev.of_node; @@ -128,7 +128,7 @@ static int __devinit gpio_halt_probe(struct platform_device *pdev) return 0; } -static int __devexit gpio_halt_remove(struct platform_device *pdev) +static int gpio_halt_remove(struct platform_device *pdev) { if (halt_node) { int gpio = of_get_gpio(halt_node, 0); @@ -165,7 +165,7 @@ static struct platform_driver gpio_halt_driver = { .of_match_table = gpio_halt_match, }, .probe = gpio_halt_probe, - .remove = __devexit_p(gpio_halt_remove), + .remove = gpio_halt_remove, }; module_platform_driver(gpio_halt_driver);