Merge branch 'origin' into devel

Conflicts: sound/soc/pxa/pxa2xx-i2s.c
2009-03-28 20:29:51 +00:00
parent 9e495834e5 5d80f8e5a9
commit ed40d0c472
3099 changed files with 224252 additions and 127768 deletions
--- a/arch/arm/include/asm/a.out.h
+++ b/arch/arm/include/asm/a.out.h
@@ -2,7 +2,7 @@
 #define __ARM_A_OUT_H__

 #include <linux/personality.h>
-#include <asm/types.h>
+#include <linux/types.h>

 struct exec
 {
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -14,7 +14,7 @@
 #ifndef __ASMARM_SETUP_H
 #define __ASMARM_SETUP_H

-#include <asm/types.h>
+#include <linux/types.h>

 #define COMMAND_LINE_SIZE 1024

--- a/arch/arm/include/asm/socket.h
+++ b/arch/arm/include/asm/socket.h
@@ -54,4 +54,7 @@

 #define SO_MARK			36

+#define SO_TIMESTAMPING		37
+#define SCM_TIMESTAMPING	SO_TIMESTAMPING
+
 #endif /* _ASM_SOCKET_H */
--- a/arch/arm/include/asm/swab.h
+++ b/arch/arm/include/asm/swab.h
@@ -16,7 +16,7 @@
 #define __ASM_ARM_SWAB_H

 #include <linux/compiler.h>
-#include <asm/types.h>
+#include <linux/types.h>

 #if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
 #  define __SWAB_64_THRU_32__