Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 27949
b: refs/heads/master
c: f2999e4
h: refs/heads/master
i:
  27947: 5f4eab7
v: v3
  • Loading branch information
David Woodhouse committed Apr 25, 2006
1 parent 549cf44 commit 5ece26c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: 25478bb26f2be1504112b764047105811a52c3cb
refs/heads/master: f2999e4ea41d6ec6252d3b6d275b40d468a3c07e
6 changes: 4 additions & 2 deletions trunk/include/linux/generic_serial.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#ifndef GENERIC_SERIAL_H
#define GENERIC_SERIAL_H

#ifdef __KERNEL__
#include <linux/mutex.h>

struct real_driver {
Expand Down Expand Up @@ -54,6 +55,7 @@ struct gs_port {
spinlock_t driver_lock;
};

#endif /* __KERNEL__ */

/* Flags */
/* Warning: serial.h defines some ASYNC_ flags, they say they are "only"
Expand All @@ -75,7 +77,7 @@ struct gs_port {
#define GS_DEBUG_FLOW 0x00000020
#define GS_DEBUG_WRITE 0x00000040


#ifdef __KERNEL__
void gs_put_char(struct tty_struct *tty, unsigned char ch);
int gs_write(struct tty_struct *tty,
const unsigned char *buf, int count);
Expand All @@ -94,5 +96,5 @@ int gs_init_port(struct gs_port *port);
int gs_setserial(struct gs_port *port, struct serial_struct __user *sp);
int gs_getserial(struct gs_port *port, struct serial_struct __user *sp);
void gs_got_break(struct gs_port *port);

#endif /* __KERNEL__ */
#endif

0 comments on commit 5ece26c

Please sign in to comment.