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

Commit ba1eb95c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'header-fixes-for-linus' of... 

Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
  x86: headers cleanup - setup.h
  emu101k1.h: fix duplicate include of <linux/types.h>
  compiler-gcc4: conditionalize #error on __KERNEL__
  remove __KERNEL_STRICT_NAMES
  make netfilter use strict integer types
  make drm headers use strict integer types
  make MTD headers use strict integer types
  make most exported headers use strict integer types
  make exported headers use strict posix types
  unconditionally include asm/types.h from linux/types.h
  make linux/types.h as assembly safe
  Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
  headers_check fix cleanup: linux/reiserfs_fs.h
  headers_check fix cleanup: linux/nubus.h
  headers_check fix cleanup: linux/coda_psdev.h
  headers_check fix: x86, setup.h
  headers_check fix: x86, prctl.h
  headers_check fix: linux/reinserfs_fs.h
  headers_check fix: linux/socket.h
  headers_check fix: linux/nubus.h
  ...

Manually fix trivial conflicts in:
	include/linux/netfilter/xt_limit.h
	include/linux/netfilter/xt_statistic.h
parents a8416961 17d14040

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__