diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-03-05 03:20:08 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-03-05 03:20:08 -0500 |
commit | 737f24bda723fdf89ecaacb99fa2bf5683c32799 (patch) | |
tree | 35495fff3e9956679cb5468e74e6814c8e44ee66 /drivers/tty/serial/m32r_sio.h | |
parent | 8eedce996556d7d06522cd3a0e6069141c8dffe0 (diff) | |
parent | b7c924274c456499264d1cfa3d44063bb11eb5db (diff) |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/perf.h
tools/perf/util/top.h
Merge reason: resolve these cherry-picking conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/tty/serial/m32r_sio.h')
-rw-r--r-- | drivers/tty/serial/m32r_sio.h | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/drivers/tty/serial/m32r_sio.h b/drivers/tty/serial/m32r_sio.h new file mode 100644 index 000000000000..e9b7e11793b1 --- /dev/null +++ b/drivers/tty/serial/m32r_sio.h | |||
@@ -0,0 +1,48 @@ | |||
1 | /* | ||
2 | * m32r_sio.h | ||
3 | * | ||
4 | * Driver for M32R serial ports | ||
5 | * | ||
6 | * Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o. | ||
7 | * Based on drivers/serial/8250.h. | ||
8 | * | ||
9 | * Copyright (C) 2001 Russell King. | ||
10 | * Copyright (C) 2004 Hirokazu Takata <takata at linux-m32r.org> | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or modify | ||
13 | * it under the terms of the GNU General Public License as published by | ||
14 | * the Free Software Foundation; either version 2 of the License, or | ||
15 | * (at your option) any later version. | ||
16 | */ | ||
17 | |||
18 | |||
19 | struct m32r_sio_probe { | ||
20 | struct module *owner; | ||
21 | int (*pci_init_one)(struct pci_dev *dev); | ||
22 | void (*pci_remove_one)(struct pci_dev *dev); | ||
23 | void (*pnp_init)(void); | ||
24 | }; | ||
25 | |||
26 | int m32r_sio_register_probe(struct m32r_sio_probe *probe); | ||
27 | void m32r_sio_unregister_probe(struct m32r_sio_probe *probe); | ||
28 | void m32r_sio_get_irq_map(unsigned int *map); | ||
29 | void m32r_sio_suspend_port(int line); | ||
30 | void m32r_sio_resume_port(int line); | ||
31 | |||
32 | struct old_serial_port { | ||
33 | unsigned int uart; | ||
34 | unsigned int baud_base; | ||
35 | unsigned int port; | ||
36 | unsigned int irq; | ||
37 | unsigned int flags; | ||
38 | unsigned char io_type; | ||
39 | unsigned char __iomem *iomem_base; | ||
40 | unsigned short iomem_reg_shift; | ||
41 | }; | ||
42 | |||
43 | #define _INLINE_ inline | ||
44 | |||
45 | #define PROBE_RSA (1 << 0) | ||
46 | #define PROBE_ANY (~0) | ||
47 | |||
48 | #define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8) | ||