Merge branch 'renesas/soc' into next/soc2

2012-03-24 19:13:59 +00:00
parent 853a0231e0 426f1af947
commit 83fe628e16
323 changed files with 3367 additions and 3824 deletions
--- 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
 * -------------------------------------------------------------------------------