diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-03-13 15:34:48 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-03-13 15:35:16 (GMT) |
| commit | df8d291f28aa1e8437c8f7816328a6516379c71b (patch) | |
| tree | 26ae585aa259584ddd0d9088933547c065c37086 /include/linux/amba | |
| parent | 5234ffb9f74cfa8993d174782bc861dd9b7b5bfb (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
| download | linux-fsl-qoriq-df8d291f28aa1e8437c8f7816328a6516379c71b.tar.xz | |
Merge branch 'linus' into irq/core
Reason: Get upstream fixes integrated before further modifications.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/amba')
| -rw-r--r-- | include/linux/amba/serial.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h index 514ed45..d117b29 100644 --- a/include/linux/amba/serial.h +++ b/include/linux/amba/serial.h @@ -23,6 +23,8 @@ #ifndef ASM_ARM_HARDWARE_SERIAL_AMBA_H #define ASM_ARM_HARDWARE_SERIAL_AMBA_H +#include <linux/types.h> + /* ------------------------------------------------------------------------------- * From AMBA UART (PL010) Block Specification * ------------------------------------------------------------------------------- |