fixes for make headers_checktilt-android-tracking-f88c306763e78c9838af8175fd1db214c93a0319

Signed-off-by: Andy Green <andy.green@linaro.org>

10 files changed, 17 insertions, 3 deletions

diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index ddd46db65b5..f3df48f6aee 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -27,6 +27,8 @@
 #ifndef _DRM_MODE_H
 #define _DRM_MODE_H
 
+#include <linux/types.h>
+
 #define DRM_DISPLAY_INFO_LEN	32
 #define DRM_CONNECTOR_NAME_LEN	32
 #define DRM_DISPLAY_MODE_LEN	32
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 28c0d114cb5..d7ddd337768 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -27,6 +27,7 @@
 #ifndef _I915_DRM_H_
 #define _I915_DRM_H_
 
+#include <linux/types.h>
 #include "drm.h"
 
 /* Please note that modifications to all structs defined here are
diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h
index fca817009e1..8058ce0ecf4 100644
--- a/include/drm/mga_drm.h
+++ b/include/drm/mga_drm.h
@@ -35,6 +35,7 @@
 #ifndef __MGA_DRM_H__
 #define __MGA_DRM_H__
 
+#include <linux/types.h>
 #include "drm.h"
 
 /* WARNING: If you change any of these defines, make sure to change the
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
index be94be6d6f1..c65b7924eff 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -33,6 +33,7 @@
 #ifndef __RADEON_DRM_H__
 #define __RADEON_DRM_H__
 
+#include <linux/types.h>
 #include "drm.h"
 
 /* WARNING: If you change any of these defines, make sure to change the
diff --git a/include/drm/via_drm.h b/include/drm/via_drm.h
index fd11a5bd892..23880b02de1 100644
--- a/include/drm/via_drm.h
+++ b/include/drm/via_drm.h
@@ -24,6 +24,7 @@
 #ifndef _VIA_DRM_H_
 #define _VIA_DRM_H_
 
+#include <linux/types.h>
 #include "drm.h"
 
 /* WARNING: These defines must be the same as what the Xserver uses.
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 78353f75d64..46349fb5cbf 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -183,6 +183,8 @@ header-y += if_plip.h
 header-y += if_ppp.h
 header-y += if_pppol2tp.h
 header-y += if_pppox.h
+header-y += if_pppolac.h
+header-y += if_pppopns.h
 header-y += if_slip.h
 header-y += if_strip.h
 header-y += if_tr.h
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index b4a77b59efb..6216064405b 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -751,6 +751,7 @@ struct sysinfo {
 };
 
 /* To identify board information in panic logs, set this */
-extern char *mach_panic_string;
+#define _NO_USRMODE_EXTERN extern
+_NO_USRMODE_EXTERN char *mach_panic_string;
 
 #endif
diff --git a/include/linux/omap_drm.h b/include/linux/omap_drm.h
index ef7f0793c37..91a3251a8d7 100644
--- a/include/linux/omap_drm.h
+++ b/include/linux/omap_drm.h
@@ -20,6 +20,8 @@
 #ifndef __OMAP_DRM_H__
 #define __OMAP_DRM_H__
 
+#ifdef __KERNEL__
+
 #include <drm/drmP.h>
 
 /* interface that plug-in drivers (for now just PVR) can implement */
@@ -84,4 +86,6 @@ struct omap_drm_platform_data {
 	const char **dev_names;
 };
 
+#endif
+
 #endif /* __OMAP_DRM_H__ */
diff --git a/include/linux/soundcard.h b/include/linux/soundcard.h
index fe204fe39f7..9ec8347a972 100644
--- a/include/linux/soundcard.h
+++ b/include/linux/soundcard.h
@@ -1063,8 +1063,9 @@ typedef struct mixer_vol_table {
  *	does not complain about SEQ_USE_EXTBUF.
  */
 #define SEQ_DECLAREBUF()		SEQ_USE_EXTBUF()
+#define _SEQ_EXTERN extern
 
-void seqbuf_dump(void);	/* This function must be provided by programs */
+_SEQ_EXTERN void seqbuf_dump(void);	/* This function must be provided by programs */
 
 #define SEQ_PM_DEFINES int __foo_bar___
 
diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
index 58ce8fe4478..5b7b1d01131 100644
--- a/include/scsi/scsi_netlink.h
+++ b/include/scsi/scsi_netlink.h
@@ -22,9 +22,9 @@
 #ifndef SCSI_NETLINK_H
 #define SCSI_NETLINK_H
 
+#include <linux/types.h>
 #include <linux/netlink.h>
 
-
 /*
  * This file intended to be included by both kernel and user space
  */