git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/soundcore-preclaim' into for-linus
[pandora-kernel.git]
/
drivers
/
serial
/
s3c6400.c
diff --git
a/drivers/serial/s3c6400.c
b/drivers/serial/s3c6400.c
index
48f1a37
..
4be92ab
100644
(file)
--- a/
drivers/serial/s3c6400.c
+++ b/
drivers/serial/s3c6400.c
@@
-122,7
+122,7
@@
static int s3c6400_serial_probe(struct platform_device *dev)
return s3c24xx_serial_probe(dev, &s3c6400_uart_inf);
}
return s3c24xx_serial_probe(dev, &s3c6400_uart_inf);
}
-static struct platform_driver s3c6400_serial_dr
v
= {
+static struct platform_driver s3c6400_serial_dr
iver
= {
.probe = s3c6400_serial_probe,
.remove = __devexit_p(s3c24xx_serial_remove),
.driver = {
.probe = s3c6400_serial_probe,
.remove = __devexit_p(s3c24xx_serial_remove),
.driver = {
@@
-131,16
+131,16
@@
static struct platform_driver s3c6400_serial_drv = {
},
};
},
};
-s3c24xx_console_init(&s3c6400_serial_dr
v
, &s3c6400_uart_inf);
+s3c24xx_console_init(&s3c6400_serial_dr
iver
, &s3c6400_uart_inf);
static int __init s3c6400_serial_init(void)
{
static int __init s3c6400_serial_init(void)
{
- return s3c24xx_serial_init(&s3c6400_serial_dr
v
, &s3c6400_uart_inf);
+ return s3c24xx_serial_init(&s3c6400_serial_dr
iver
, &s3c6400_uart_inf);
}
static void __exit s3c6400_serial_exit(void)
{
}
static void __exit s3c6400_serial_exit(void)
{
- platform_driver_unregister(&s3c6400_serial_dr
v
);
+ platform_driver_unregister(&s3c6400_serial_dr
iver
);
}
module_init(s3c6400_serial_init);
}
module_init(s3c6400_serial_init);