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

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
parents 700d4558 d280cc98

include/linux/auto_fs.h

+1 −2
Original line number Diff line number Diff line
@@ -14,13 +14,12 @@ 
#ifndef _LINUX_AUTO_FS_H

#define _LINUX_AUTO_FS_H



#include <linux/types.h>

#ifdef __KERNEL__

#include <linux/fs.h>

#include <linux/limits.h>

#include <linux/types.h>

#include <linux/ioctl.h>

#else

#include <asm/types.h>

#include <sys/ioctl.h>

#endif /* __KERNEL__ */

include/linux/net_dropmon.h

+1 −0
Original line number Diff line number Diff line 
#ifndef __NET_DROPMON_H

#define __NET_DROPMON_H



#include <linux/types.h>

#include <linux/netlink.h>



struct net_dm_drop_point {