diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-01 18:16:57 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-01 18:16:57 +0100 |
| commit | 949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73 (patch) | |
| tree | 9a268cbb25992fdd7147e8af72f68d315ef4caeb /include/linux/usb/ch11.h | |
| parent | 74374e40791f1f7b58252df275dd5227ead88b89 (diff) | |
| parent | bf6a68d2a214e07f7c0d6538e00e17b826714160 (diff) | |
| download | kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.zip kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.tar.gz kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.tar.bz2 | |
Merge branch 'linux-3.0.y' into cm.ics
Diffstat (limited to 'include/linux/usb/ch11.h')
| -rw-r--r-- | include/linux/usb/ch11.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/linux/usb/ch11.h b/include/linux/usb/ch11.h index 4ebaf08..1eb735b 100644 --- a/include/linux/usb/ch11.h +++ b/include/linux/usb/ch11.h @@ -62,12 +62,6 @@ #define USB_PORT_FEAT_TEST 21 #define USB_PORT_FEAT_INDICATOR 22 #define USB_PORT_FEAT_C_PORT_L1 23 -#define USB_PORT_FEAT_C_PORT_LINK_STATE 25 -#define USB_PORT_FEAT_C_PORT_CONFIG_ERROR 26 -#define USB_PORT_FEAT_PORT_REMOTE_WAKE_MASK 27 -#define USB_PORT_FEAT_BH_PORT_RESET 28 -#define USB_PORT_FEAT_C_BH_PORT_RESET 29 -#define USB_PORT_FEAT_FORCE_LINKPM_ACCEPT 30 /* * Port feature selectors added by USB 3.0 spec. @@ -76,8 +70,8 @@ #define USB_PORT_FEAT_LINK_STATE 5 #define USB_PORT_FEAT_U1_TIMEOUT 23 #define USB_PORT_FEAT_U2_TIMEOUT 24 -#define USB_PORT_FEAT_C_LINK_STATE 25 -#define USB_PORT_FEAT_C_CONFIG_ERR 26 +#define USB_PORT_FEAT_C_PORT_LINK_STATE 25 +#define USB_PORT_FEAT_C_PORT_CONFIG_ERROR 26 #define USB_PORT_FEAT_REMOTE_WAKE_MASK 27 #define USB_PORT_FEAT_BH_PORT_RESET 28 #define USB_PORT_FEAT_C_BH_PORT_RESET 29 |