git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[safe/jmp/linux-2.6]
/
drivers
/
serial
/
s3c2400.c
diff --git
a/drivers/serial/s3c2400.c
b/drivers/serial/s3c2400.c
index
a110205
..
fb00ed5
100644
(file)
--- a/
drivers/serial/s3c2400.c
+++ b/
drivers/serial/s3c2400.c
@@
-17,10
+17,10
@@
#include <asm/irq.h>
#include <asm/irq.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
-#include <
asm/plat-s3c
/regs-serial.h>
-#include <
asm/ar
ch/regs-gpio.h>
+#include <
plat
/regs-serial.h>
+#include <
ma
ch/regs-gpio.h>
#include "samsung.h"
#include "samsung.h"
@@
-78,7
+78,7
@@
static int s3c2400_serial_probe(struct platform_device *dev)
static struct platform_driver s3c2400_serial_drv = {
.probe = s3c2400_serial_probe,
static struct platform_driver s3c2400_serial_drv = {
.probe = s3c2400_serial_probe,
- .remove =
s3c24xx_serial_remove
,
+ .remove =
__devexit_p(s3c24xx_serial_remove)
,
.driver = {
.name = "s3c2400-uart",
.owner = THIS_MODULE,
.driver = {
.name = "s3c2400-uart",
.owner = THIS_MODULE,