diff options
| author | Karol Lewandowski <k.lewandowsk@samsung.com> | 2014-09-05 21:04:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-05 14:52:14 -0700 |
| commit | 03cb8b46c1779090dcd906cb039cfebb17ef32be (patch) | |
| tree | 354a0e93dba764a871d9ddfb63eb387d5ec23654 /include/uapi | |
| parent | 918e20898ae4ae524b5a5dc0cfa56db7686906fa (diff) | |
| download | lwn-03cb8b46c1779090dcd906cb039cfebb17ef32be.tar.gz lwn-03cb8b46c1779090dcd906cb039cfebb17ef32be.zip | |
usb: gadget: f_fs: drop duplicate usb_functionfs_descs_head declaration
Applicable for 3.14-stable only, as this revertes a previous commit that was incorrect.
This commit drops duplicate declaration of struct usb_functionfs_descs_head
erronousely added in commit 28c5980b54 ("usb: gadget: f_fs: resurect
usb_functionfs_descs_head structure").
Fix from 28c5980b54 is applicable only for v3.15-rc1 and newer kernels.
This fixes error in uapi:
/src/linux$ make -C tools usb
make: Entering directory '/src/linux/tools'
DESCEND usb
make[1]: Entering directory '/src/linux/tools/usb'
gcc -Wall -Wextra -g -I../include -o testusb testusb.c -lpthread
gcc -Wall -Wextra -g -I../include -o ffs-test ffs-test.c -lpthread
In file included from ffs-test.c:41:0:
../../include/uapi/linux/usb/functionfs.h:42:8: error: redefinition of ‘struct usb_functionfs_descs_head’
struct usb_functionfs_descs_head {
^
../../include/uapi/linux/usb/functionfs.h:31:8: note: originally defined here
struct usb_functionfs_descs_head {
^
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/usb/functionfs.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h index 29e9c7aa9c66..f279394aafb0 100644 --- a/include/uapi/linux/usb/functionfs.h +++ b/include/uapi/linux/usb/functionfs.h @@ -27,24 +27,18 @@ struct usb_endpoint_descriptor_no_audio { __u8 bInterval; } __attribute__((packed)); -/* Legacy format, deprecated as of 3.14. */ -struct usb_functionfs_descs_head { - __le32 magic; - __le32 length; - __le32 fs_count; - __le32 hs_count; -} __attribute__((packed, deprecated)); /* * All numbers must be in little endian order. */ +/* Legacy format, deprecated as of 3.14. */ struct usb_functionfs_descs_head { __le32 magic; __le32 length; __le32 fs_count; __le32 hs_count; -} __attribute__((packed)); +} __attribute__((packed, deprecated)); /* * Descriptors format: |