am 4d6e7a3b: am 24e005a2: am c7daea04: Merge "Replace __unused in linux/sysctl.h with __linux_unused"

* commit '4d6e7a3b9f929767596c5a77781a9fa7d1fd9706':
  Replace __unused in linux/sysctl.h with __linux_unused
This commit is contained in:
Andrew Hsieh
2012-09-26 15:52:19 -07:00
committed by Android Git Automerger
2 changed files with 2 additions and 2 deletions

View File

@@ -66,7 +66,7 @@ struct icmphdr {
} echo; } echo;
__u32 gateway; __u32 gateway;
struct { struct {
__u16 __unused_field; __u16 __linux_unused;
__u16 mtu; __u16 mtu;
} frag; } frag;
} un; } un;

View File

@@ -28,7 +28,7 @@ struct __sysctl_args {
size_t __user *oldlenp; size_t __user *oldlenp;
void __user *newval; void __user *newval;
size_t newlen; size_t newlen;
unsigned long __unused[4]; unsigned long __linux_unused[4];
}; };
enum enum