diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-08 08:26:36 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-08 08:26:36 +0100 |
commit | 79606b51ed58819bd71bc6ca7d1a41185f83c89c (patch) | |
tree | ac057d11a56341df849761c9f08e6e8be353e3aa /arch | |
parent | 05261801e9cde103b3c4df843472027c007531da (diff) | |
parent | f0c29241001e44f6d29b757be9c7efeed6b0b2fe (diff) | |
download | barebox-79606b51ed58819bd71bc6ca7d1a41185f83c89c.tar.gz barebox-79606b51ed58819bd71bc6ca7d1a41185f83c89c.tar.xz |
Merge branch 'for-next/linux-headers'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/nios2/include/asm/types.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/types.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/nios2/include/asm/types.h b/arch/nios2/include/asm/types.h index 0067ea83c1..710ee55796 100644 --- a/arch/nios2/include/asm/types.h +++ b/arch/nios2/include/asm/types.h @@ -3,4 +3,6 @@ #include <asm/int-ll64.h> +typedef unsigned short umode_t; + #endif diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h index d60612ff74..7349ba03c2 100644 --- a/arch/x86/include/asm/types.h +++ b/arch/x86/include/asm/types.h @@ -41,6 +41,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; +typedef unsigned short umode_t; + #include <asm-generic/bitsperlong.h> #endif /* __ASSEMBLY__ */ |