openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/headers-check-2.6:
  headers_check fix: linux/net_dropmon.h
  headers_check fix: linux/auto_fs.h
This commit is contained in:
Linus Torvalds 2009-06-01 08:01:42 -07:00
parent 700d4558fc d280cc989a
commit c4e51e4657
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/auto_fs.h
View File

@ -14,13 +14,12 @@
#ifndef _LINUX_AUTO_FS_H #ifndef _LINUX_AUTO_FS_H
#define _LINUX_AUTO_FS_H #define _LINUX_AUTO_FS_H
#include <linux/types.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/types.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#else #else
#include <asm/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

1
include/linux/net_dropmon.h
View File

@ -1,6 +1,7 @@
#ifndef __NET_DROPMON_H #ifndef __NET_DROPMON_H
#define __NET_DROPMON_H #define __NET_DROPMON_H
#include <linux/types.h>
#include <linux/netlink.h> #include <linux/netlink.h>
struct net_dm_drop_point { struct net_dm_drop_point {