projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/src/linux-2.6/
[powerpc.git]
/
drivers
/
char
/
mxser.c
diff --git
a/drivers/char/mxser.c
b/drivers/char/mxser.c
index
3b965a6
..
ea725a9
100644
(file)
--- a/
drivers/char/mxser.c
+++ b/
drivers/char/mxser.c
@@
-38,7
+38,6
@@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/autoconf.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/autoconf.h>
#include <linux/errno.h>
#include <linux/signal.h>
@@
-814,7
+813,7
@@
static int mxser_init(void)
/* start finding PCI board here */
#ifdef CONFIG_PCI
/* start finding PCI board here */
#ifdef CONFIG_PCI
- n =
(sizeof(mxser_pcibrds) / sizeof(mxser_pcibrds[0])
) - 1;
+ n =
ARRAY_SIZE(mxser_pcibrds
) - 1;
index = 0;
b = 0;
while (b < n) {
index = 0;
b = 0;
while (b < n) {
@@
-1983,7
+1982,7
@@
static void mxser_receive_chars(struct mxser_struct *info, int *status)
spin_lock_irqsave(&info->slock, flags);
spin_lock_irqsave(&info->slock, flags);
- recv_room = tty->
ldisc.receive_room(tty)
;
+ recv_room = tty->
receive_room
;
if ((recv_room == 0) && (!info->ldisc_stop_rx)) {
//mxser_throttle(tty);
mxser_stoprx(tty);
if ((recv_room == 0) && (!info->ldisc_stop_rx)) {
//mxser_throttle(tty);
mxser_stoprx(tty);