Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361421
b: refs/heads/master
c: 9997d08
h: refs/heads/master
i:
  361419: c4f1c5a
v: v3
  • Loading branch information
Ben Collins authored and Linus Torvalds committed Mar 19, 2013
1 parent 9df972d commit 086aec8
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: b63dc123b20e54a306ff1bfa191e511c506ee331
refs/heads/master: 9997d08806062cb7ba471ab12fa2742cfec2f413
6 changes: 3 additions & 3 deletions trunk/arch/powerpc/platforms/85xx/sgy_cts1000.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 086aec8

Please sign in to comment.