Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22796b15 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/header-fixes' into x86/headers 

Conflicts:
	arch/x86/include/asm/setup.h
parents bf33a70a 0fb807c3

arch/alpha/include/asm/statfs.h

+2 −0
Original line number Diff line number Diff line 
#ifndef _ALPHA_STATFS_H

#define _ALPHA_STATFS_H



#include <linux/types.h>



/* Alpha is the only 64-bit platform with 32-bit statfs. And doesn't

   even seem to implement statfs64 */

#define __statfs_word __u32

arch/alpha/include/asm/swab.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _ALPHA_SWAB_H

#define _ALPHA_SWAB_H



#include <asm/types.h>

#include <linux/types.h>

#include <linux/compiler.h>

#include <asm/compiler.h>

arch/arm/include/asm/a.out.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define __ARM_A_OUT_H__



#include <linux/personality.h>

#include <asm/types.h>

#include <linux/types.h>



struct exec

{

arch/arm/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/include/asm/swab.h

+1 −1
Original line number Diff line number Diff line
@@ -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__