diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-13 11:37:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-13 11:37:06 +0200 |
| commit | 3c69ea44406bf27b6f2e9b2f11238c344fd8374d (patch) | |
| tree | b459600bfffb55b6693b566f5dff859daa216dbe /include/uapi | |
| parent | 53b3ffee788559fe26d32f21b223bf4bad959477 (diff) | |
| parent | e8d65a8d985271a102f07c7456da5b86c19ffe16 (diff) | |
| download | blackbird-op-linux-3c69ea44406bf27b6f2e9b2f11238c344fd8374d.tar.gz blackbird-op-linux-3c69ea44406bf27b6f2e9b2f11238c344fd8374d.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/userfaultfd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h index df0e09bb7dd5..9057d7af3ae1 100644 --- a/include/uapi/linux/userfaultfd.h +++ b/include/uapi/linux/userfaultfd.h @@ -11,8 +11,6 @@ #include <linux/types.h> -#include <linux/compiler.h> - #define UFFD_API ((__u64)0xAA) /* * After implementing the respective features it will become: |
