diff --git a/[refs] b/[refs] index c31f36eff3c4..d8c9a7191fc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afbf510d47c4009f5d67ec3c0e0b45eb0441bca3 +refs/heads/master: 5418b6925c353c8286651b67fdb8559dd9e54e46 diff --git a/trunk/arch/ia64/ia32/ia32_ioctl.c b/trunk/arch/ia64/ia32/ia32_ioctl.c index 9845dabe2613..164b211f4174 100644 --- a/trunk/arch/ia64/ia32/ia32_ioctl.c +++ b/trunk/arch/ia64/ia32/ia32_ioctl.c @@ -13,7 +13,6 @@ #define INCLUDES #include "compat_ioctl.c" -#include #define IOCTL_NR(a) ((a) & ~(_IOC_SIZEMASK << _IOC_SIZESHIFT)) diff --git a/trunk/include/asm-ia64/ioctl32.h b/trunk/include/asm-ia64/ioctl32.h index d0d227f45e05..e69de29bb2d1 100644 --- a/trunk/include/asm-ia64/ioctl32.h +++ b/trunk/include/asm-ia64/ioctl32.h @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-x86_64/ioctl32.h b/trunk/include/asm-x86_64/ioctl32.h index d0d227f45e05..e69de29bb2d1 100644 --- a/trunk/include/asm-x86_64/ioctl32.h +++ b/trunk/include/asm-x86_64/ioctl32.h @@ -1 +0,0 @@ -#include