diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
| commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
| tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /drivers/serial/pxa.c | |
| parent | 0b5adf92ec793c665b0de63ac146d190a921c391 (diff) | |
| parent | 6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff) | |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'drivers/serial/pxa.c')
| -rw-r--r-- | drivers/serial/pxa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 56ee082157aa..1102a39b44f5 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/serial_core.h> | 44 | #include <linux/serial_core.h> |
| 45 | #include <linux/clk.h> | 45 | #include <linux/clk.h> |
| 46 | #include <linux/io.h> | 46 | #include <linux/io.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | 48 | ||
| 48 | struct uart_pxa_port { | 49 | struct uart_pxa_port { |
| 49 | struct uart_port port; | 50 | struct uart_port port; |