Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
This commit is contained in:
commit
c00a30dfd0
77 changed files with 839 additions and 437 deletions
|
|
@ -139,11 +139,11 @@ struct pppoe_tag {
|
|||
|
||||
struct pppoe_hdr {
|
||||
#if defined(__LITTLE_ENDIAN_BITFIELD)
|
||||
__u8 ver : 4;
|
||||
__u8 type : 4;
|
||||
__u8 ver : 4;
|
||||
#elif defined(__BIG_ENDIAN_BITFIELD)
|
||||
__u8 type : 4;
|
||||
__u8 ver : 4;
|
||||
__u8 type : 4;
|
||||
#else
|
||||
#error "Please fix <asm/byteorder.h>"
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue