aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/s3c_udc.h
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.com>2012-09-22 09:48:20 +0200
committercodeworkx <codeworkx@cyanogenmod.com>2012-09-22 14:02:16 +0200
commit2489007e7d740ccbc3e0a202914e243ad5178787 (patch)
treeb8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/usb/gadget/s3c_udc.h
parent5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff)
downloadkernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/usb/gadget/s3c_udc.h')
-rw-r--r--drivers/usb/gadget/s3c_udc.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/gadget/s3c_udc.h b/drivers/usb/gadget/s3c_udc.h
index a75f8f2..c6bf986 100644
--- a/drivers/usb/gadget/s3c_udc.h
+++ b/drivers/usb/gadget/s3c_udc.h
@@ -142,7 +142,11 @@ struct s3c_udc {
unsigned req_pending:1, req_std:1, req_config:1;
struct wake_lock usbd_wake_lock;
struct wake_lock usb_cb_wake_lock;
+ int softconnect;
int udc_enabled;
+ int is_usb_ready;
+ struct delayed_work usb_ready_work;
+ struct mutex mutex;
};
extern struct s3c_udc *the_controller;