Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199231
b: refs/heads/master
c: 5d66cee
h: refs/heads/master
i:
  199229: 4169ce1
  199227: 2bf4d28
  199223: a4d5c92
  199215: c61fd8b
  199199: 41ff4b5
  199167: 6c41732
v: v3
  • Loading branch information
Marek Szyprowski authored and Ben Dooks committed May 28, 2010
1 parent eb311f5 commit 373274d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: ece8ae4932703b37ea01222ea3e969a26692c871
refs/heads/master: 5d66ceee78f74ca52661634f6f822a99cf406974
8 changes: 4 additions & 4 deletions trunk/drivers/serial/s5pv210.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ static int s5p_serial_probe(struct platform_device *pdev)
return s3c24xx_serial_probe(pdev, s5p_uart_inf[pdev->id]);
}

static struct platform_driver s5p_serial_drv = {
static struct platform_driver s5p_serial_driver = {
.probe = s5p_serial_probe,
.remove = __devexit_p(s3c24xx_serial_remove),
.driver = {
Expand All @@ -130,19 +130,19 @@ static struct platform_driver s5p_serial_drv = {

static int __init s5pv210_serial_console_init(void)
{
return s3c24xx_serial_initconsole(&s5p_serial_drv, s5p_uart_inf);
return s3c24xx_serial_initconsole(&s5p_serial_driver, s5p_uart_inf);
}

console_initcall(s5pv210_serial_console_init);

static int __init s5p_serial_init(void)
{
return s3c24xx_serial_init(&s5p_serial_drv, *s5p_uart_inf);
return s3c24xx_serial_init(&s5p_serial_driver, *s5p_uart_inf);
}

static void __exit s5p_serial_exit(void)
{
platform_driver_unregister(&s5p_serial_drv);
platform_driver_unregister(&s5p_serial_driver);
}

module_init(s5p_serial_init);
Expand Down

0 comments on commit 373274d

Please sign in to comment.