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

1 files changed, 14 insertions, 13 deletions

diff --git a/include/linux/if_arcnet.h b/include/linux/if_arcnet.h
index 27ea2ac445ad..0835debab115 100644
--- a/include/linux/if_arcnet.h
+++ b/include/linux/if_arcnet.h
@@ -16,6 +16,7 @@
 #ifndef _LINUX_IF_ARCNET_H
 #define _LINUX_IF_ARCNET_H
 
+#include <linux/types.h>
 #include <linux/if_ether.h>
 
 
@@ -57,10 +58,10 @@
  */
 struct arc_rfc1201
 {
-    uint8_t  proto;             /* protocol ID field - varies           */
-    uint8_t  split_flag;        /* for use with split packets           */
+    __u8  proto;                /* protocol ID field - varies           */
+    __u8  split_flag;   /* for use with split packets           */
     __be16   sequence;          /* sequence number                      */
-    uint8_t  payload[0];        /* space remaining in packet (504 bytes)*/
+    __u8  payload[0];   /* space remaining in packet (504 bytes)*/
 };
 #define RFC1201_HDR_SIZE 4
 
@@ -70,8 +71,8 @@ struct arc_rfc1201
  */
 struct arc_rfc1051
 {
-    uint8_t proto;              /* ARC_P_RFC1051_ARP/RFC1051_IP */
-    uint8_t payload[0];         /* 507 bytes                    */
+    __u8 proto;         /* ARC_P_RFC1051_ARP/RFC1051_IP */
+    __u8 payload[0];            /* 507 bytes                    */
 };
 #define RFC1051_HDR_SIZE 1
 
@@ -82,20 +83,20 @@ struct arc_rfc1051
  */
 struct arc_eth_encap
 {
-    uint8_t proto;              /* Always ARC_P_ETHER                   */
+    __u8 proto;         /* Always ARC_P_ETHER                   */
     struct ethhdr eth;          /* standard ethernet header (yuck!)     */
-    uint8_t payload[0];         /* 493 bytes                            */
+    __u8 payload[0];            /* 493 bytes                            */
 };
 #define ETH_ENCAP_HDR_SIZE 14
 
 
 struct arc_cap
 {
-        uint8_t proto;
-        uint8_t cookie[sizeof(int)];   /* Actually NOT sent over the network */
+        __u8 proto;
+        __u8 cookie[sizeof(int)];   /* Actually NOT sent over the network */
         union {
-                uint8_t ack;
-                uint8_t raw[0];         /* 507 bytes */
+                __u8 ack;
+                __u8 raw[0];            /* 507 bytes */
         } mes;
 };
 
@@ -109,7 +110,7 @@ struct arc_cap
  */
 struct arc_hardware
 {
-    uint8_t  source,            /* source ARCnet - filled in automagically */
+    __u8  source,               /* source ARCnet - filled in automagically */
              dest,              /* destination ARCnet - 0 for broadcast    */
              offset[2];         /* offset bytes (some weird semantics)     */
 };
@@ -130,7 +131,7 @@ struct archdr
         struct arc_rfc1051   rfc1051;
         struct arc_eth_encap eth_encap;
         struct arc_cap       cap;
-        uint8_t raw[0];         /* 508 bytes                            */
+        __u8 raw[0];            /* 508 bytes                            */
     } soft;
 };