diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-06-03 23:32:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-03 23:32:12 -0700 |
| commit | c99f7abf0e69987e4add567e155e042cb1f2a20b (patch) | |
| tree | d23898dc30ed25c1dae9bb6325041027d412397a /drivers/usb/serial/io_usbvend.h | |
| parent | net: remove some unless free on failure in alloc_netdev_mqs() (diff) | |
| parent | sh_eth: fix SH7619/771x support (diff) | |
| download | linux-dev-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.xz linux-dev-c99f7abf0e69987e4add567e155e042cb1f2a20b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/net/inetpeer.h
net/ipv6/output_core.c
Changes in net were fixing bugs in code removed in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/serial/io_usbvend.h')
| -rw-r--r-- | drivers/usb/serial/io_usbvend.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/io_usbvend.h b/drivers/usb/serial/io_usbvend.h index 51f83fbb73bb..6f6a856bc37c 100644 --- a/drivers/usb/serial/io_usbvend.h +++ b/drivers/usb/serial/io_usbvend.h @@ -594,7 +594,7 @@ struct edge_boot_descriptor { struct ti_i2c_desc { __u8 Type; // Type of descriptor - __u16 Size; // Size of data only not including header + __le16 Size; // Size of data only not including header __u8 CheckSum; // Checksum (8 bit sum of data only) __u8 Data[0]; // Data starts here } __attribute__((packed)); |