diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-04 15:42:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-04 15:42:20 +1000 |
| commit | 9e1bd9a6f8c6ad8b461294a365c49b19212178d9 (patch) | |
| tree | cdfb94ac635ef7050c6baa6448aa266c20abeeb0 /drivers/staging/usbip/usbip_common.h | |
| parent | 53823196033690f2f07382a94c982af486b94abb (diff) | |
| parent | e595eea993e499763922b2526cf67555c64612bc (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/netwave/netwave_cs.c
Diffstat (limited to 'drivers/staging/usbip/usbip_common.h')
| -rw-r--r-- | drivers/staging/usbip/usbip_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h index 6f1dcb197d13..e1bbd1287e28 100644 --- a/drivers/staging/usbip/usbip_common.h +++ b/drivers/staging/usbip/usbip_common.h @@ -182,7 +182,7 @@ struct usbip_header_basic { __u32 devid; #define USBIP_DIR_OUT 0 -#define USBIP_DIR_IN 1 +#define USBIP_DIR_IN 1 __u32 direction; __u32 ep; /* endpoint number */ } __attribute__ ((packed)); |