diff options
| author | Badhri Jagan Sridharan <Badhri@google.com> | 2015-03-27 14:49:55 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2015-07-18 20:02:18 +0530 |
| commit | 0ef17242dd0b2233b1d0fb6e8909b85e328f2f22 (patch) | |
| tree | 4dc9ff3688e94801d3f9b40324fbc1bc48455a28 | |
| parent | 4722734dbde81d0e145be5887685aebba999ba66 (diff) | |
| download | linux-0ef17242dd0b2233b1d0fb6e8909b85e328f2f22.tar.gz | |
usb: gadget: Move gadget functions code
3.18 kernel has reorganized drivers/usb/gadget
directory. Moving gadget functions drivers from
drivers/usb/gadget to drivers/usb/gadget/function
Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Change-Id: I1eab0190f8d42e3be1b4e91ad3bc3a2dc853b0ef
[AmitP: Cherry-picked it from android-3.18 to flo mainline kernel]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
drivers/usb/gadget/Makefile
drivers/usb/gadget/function/Makefile
drivers/usb/gadget/function/f_audio_source.c
| -rw-r--r-- | drivers/usb/gadget/Makefile | 5 | ||||
| -rw-r--r-- | drivers/usb/gadget/function/Makefile | 4 | ||||
| -rw-r--r-- | drivers/usb/gadget/function/f_mtp.c (renamed from drivers/usb/gadget/f_mtp.c) | 0 | ||||
| -rw-r--r-- | drivers/usb/gadget/function/f_mtp.h (renamed from drivers/usb/gadget/f_mtp.h) | 0 | ||||
| -rw-r--r-- | drivers/usb/gadget/function/f_ptp.c (renamed from drivers/usb/gadget/f_ptp.c) | 0 |
5 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 502c379cce80..598a67d6ba05 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -10,8 +10,3 @@ libcomposite-y := usbstring.o config.o epautoconf.o libcomposite-y += composite.o functions.o configfs.o u_f.o obj-$(CONFIG_USB_GADGET) += udc/ function/ legacy/ - -usb_f_mtp-y := f_mtp.o -obj-$(CONFIG_USB_F_MTP) += usb_f_mtp.o -usb_f_ptp-y := f_ptp.o -obj-$(CONFIG_USB_F_PTP) += usb_f_ptp.o diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile index bd7def576955..966f89f03506 100644 --- a/drivers/usb/gadget/function/Makefile +++ b/drivers/usb/gadget/function/Makefile @@ -44,3 +44,7 @@ usb_f_hid-y := f_hid.o obj-$(CONFIG_USB_F_HID) += usb_f_hid.o usb_f_printer-y := f_printer.o obj-$(CONFIG_USB_F_PRINTER) += usb_f_printer.o +usb_f_mtp-y := f_mtp.o +obj-$(CONFIG_USB_F_MTP) += usb_f_mtp.o +usb_f_ptp-y := f_ptp.o +obj-$(CONFIG_USB_F_PTP) += usb_f_ptp.o diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c index 82f6b2ebaebb..82f6b2ebaebb 100644 --- a/drivers/usb/gadget/f_mtp.c +++ b/drivers/usb/gadget/function/f_mtp.c diff --git a/drivers/usb/gadget/f_mtp.h b/drivers/usb/gadget/function/f_mtp.h index 7adb1ff08eff..7adb1ff08eff 100644 --- a/drivers/usb/gadget/f_mtp.h +++ b/drivers/usb/gadget/function/f_mtp.h diff --git a/drivers/usb/gadget/f_ptp.c b/drivers/usb/gadget/function/f_ptp.c index da3e4d53e085..da3e4d53e085 100644 --- a/drivers/usb/gadget/f_ptp.c +++ b/drivers/usb/gadget/function/f_ptp.c |