projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[powerpc.git]
/
drivers
/
serial
/
sa1100.c
diff --git
a/drivers/serial/sa1100.c
b/drivers/serial/sa1100.c
index
1225b14
..
ed618cc
100644
(file)
--- a/
drivers/serial/sa1100.c
+++ b/
drivers/serial/sa1100.c
@@
-35,7
+35,7
@@
#include <linux/init.h>
#include <linux/console.h>
#include <linux/sysrq.h>
#include <linux/init.h>
#include <linux/console.h>
#include <linux/sysrq.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/serial_core.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/serial_core.h>
@@
-799,7
+799,7
@@
sa1100_console_setup(struct console *co, char *options)
return uart_set_options(&sport->port, co, baud, parity, bits, flow);
}
return uart_set_options(&sport->port, co, baud, parity, bits, flow);
}
-
extern
struct uart_driver sa1100_reg;
+
static
struct uart_driver sa1100_reg;
static struct console sa1100_console = {
.name = "ttySA",
.write = sa1100_console_write,
static struct console sa1100_console = {
.name = "ttySA",
.write = sa1100_console_write,
@@
-834,21
+834,21
@@
static struct uart_driver sa1100_reg = {
.cons = SA1100_CONSOLE,
};
.cons = SA1100_CONSOLE,
};
-static int sa1100_serial_suspend(struct device *_dev, pm_message_t state
, u32 level
)
+static int sa1100_serial_suspend(struct device *_dev, pm_message_t state)
{
struct sa1100_port *sport = dev_get_drvdata(_dev);
{
struct sa1100_port *sport = dev_get_drvdata(_dev);
- if (sport
&& level == SUSPEND_DISABLE
)
+ if (sport)
uart_suspend_port(&sa1100_reg, &sport->port);
return 0;
}
uart_suspend_port(&sa1100_reg, &sport->port);
return 0;
}
-static int sa1100_serial_resume(struct device *_dev
, u32 level
)
+static int sa1100_serial_resume(struct device *_dev)
{
struct sa1100_port *sport = dev_get_drvdata(_dev);
{
struct sa1100_port *sport = dev_get_drvdata(_dev);
- if (sport
&& level == RESUME_ENABLE
)
+ if (sport)
uart_resume_port(&sa1100_reg, &sport->port);
return 0;
uart_resume_port(&sa1100_reg, &sport->port);
return 0;