diff options
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/function/Makefile | 4 | ||||
| -rw-r--r-- | drivers/usb/misc/diag_ipc_bridge.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile index e04ca4b97c8e..106507dc7ee0 100644 --- a/drivers/usb/gadget/function/Makefile +++ b/drivers/usb/gadget/function/Makefile @@ -26,7 +26,7 @@ usb_f_eem-y := f_eem.o obj-$(CONFIG_USB_F_EEM) += usb_f_eem.o usb_f_ecm_subset-y := f_subset.o obj-$(CONFIG_USB_F_SUBSET) += usb_f_ecm_subset.o -usb_f_rndis-y := f_rndis.o rndis.o +usb_f_rndis-y := f_rndis.o obj-$(CONFIG_USB_F_RNDIS) += usb_f_rndis.o usb_f_mass_storage-y := f_mass_storage.o storage_common.o obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o @@ -57,7 +57,7 @@ usb_f_accessory-y := f_accessory.o obj-$(CONFIG_USB_F_ACC) += usb_f_accessory.o usb_f_diag-y := f_diag.o obj-$(CONFIG_USB_F_DIAG) += usb_f_diag.o -usb_f_gsi-y := f_gsi.o rndis.o +usb_f_gsi-y := f_gsi.o obj-$(CONFIG_USB_F_GSI) += usb_f_gsi.o usb_f_cdev-y := f_cdev.o obj-$(CONFIG_USB_F_CDEV) += usb_f_cdev.o diff --git a/drivers/usb/misc/diag_ipc_bridge.c b/drivers/usb/misc/diag_ipc_bridge.c index 780746e8e630..3c7bdbba8a56 100644 --- a/drivers/usb/misc/diag_ipc_bridge.c +++ b/drivers/usb/misc/diag_ipc_bridge.c @@ -107,7 +107,7 @@ int diag_bridge_open(int id, struct diag_bridge_ops *ops) dev->ops = ops; dev->err = 0; -#ifdef CONFIG_PM_RUNTIME +#ifdef CONFIG_PM dev->default_autosusp_delay = dev->udev->dev.power.autosuspend_delay; #endif |