diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/maple.h | 1 | ||||
-rw-r--r-- | include/linux/serial_sci.h | 32 |
2 files changed, 32 insertions, 1 deletions
diff --git a/include/linux/maple.h b/include/linux/maple.h index 3f01e2bae1a1..d31e36ebb436 100644 --- a/include/linux/maple.h +++ b/include/linux/maple.h | |||
@@ -64,7 +64,6 @@ struct maple_driver { | |||
64 | int (*connect) (struct maple_device * dev); | 64 | int (*connect) (struct maple_device * dev); |
65 | void (*disconnect) (struct maple_device * dev); | 65 | void (*disconnect) (struct maple_device * dev); |
66 | struct device_driver drv; | 66 | struct device_driver drv; |
67 | int registered; | ||
68 | }; | 67 | }; |
69 | 68 | ||
70 | void maple_getcond_callback(struct maple_device *dev, | 69 | void maple_getcond_callback(struct maple_device *dev, |
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h new file mode 100644 index 000000000000..893cc53486bc --- /dev/null +++ b/include/linux/serial_sci.h | |||
@@ -0,0 +1,32 @@ | |||
1 | #ifndef __LINUX_SERIAL_SCI_H | ||
2 | #define __LINUX_SERIAL_SCI_H | ||
3 | |||
4 | #include <linux/serial_core.h> | ||
5 | |||
6 | /* | ||
7 | * Generic header for SuperH SCI(F) (used by sh/sh64/h8300 and related parts) | ||
8 | */ | ||
9 | |||
10 | /* Offsets into the sci_port->irqs array */ | ||
11 | enum { | ||
12 | SCIx_ERI_IRQ, | ||
13 | SCIx_RXI_IRQ, | ||
14 | SCIx_TXI_IRQ, | ||
15 | SCIx_BRI_IRQ, | ||
16 | SCIx_NR_IRQS, | ||
17 | }; | ||
18 | |||
19 | /* | ||
20 | * Platform device specific platform_data struct | ||
21 | */ | ||
22 | struct plat_sci_port { | ||
23 | void __iomem *membase; /* io cookie */ | ||
24 | unsigned long mapbase; /* resource base */ | ||
25 | unsigned int irqs[SCIx_NR_IRQS]; /* ERI, RXI, TXI, BRI */ | ||
26 | unsigned int type; /* SCI / SCIF / IRDA */ | ||
27 | upf_t flags; /* UPF_* flags */ | ||
28 | }; | ||
29 | |||
30 | int early_sci_setup(struct uart_port *port); | ||
31 | |||
32 | #endif /* __LINUX_SERIAL_SCI_H */ | ||