diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/usb/gadget/multi.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'drivers/usb/gadget/multi.c')
| -rw-r--r-- | drivers/usb/gadget/multi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c index 2a1ebefd8f9e..23393254a8a3 100644 --- a/drivers/usb/gadget/multi.c +++ b/drivers/usb/gadget/multi.c | |||
| @@ -179,7 +179,7 @@ err_conf: | |||
| 179 | return ret; | 179 | return ret; |
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | static int rndis_config_register(struct usb_composite_dev *cdev) | 182 | static __ref int rndis_config_register(struct usb_composite_dev *cdev) |
| 183 | { | 183 | { |
| 184 | static struct usb_configuration config = { | 184 | static struct usb_configuration config = { |
| 185 | .bConfigurationValue = MULTI_RNDIS_CONFIG_NUM, | 185 | .bConfigurationValue = MULTI_RNDIS_CONFIG_NUM, |
| @@ -194,7 +194,7 @@ static int rndis_config_register(struct usb_composite_dev *cdev) | |||
| 194 | 194 | ||
| 195 | #else | 195 | #else |
| 196 | 196 | ||
| 197 | static int rndis_config_register(struct usb_composite_dev *cdev) | 197 | static __ref int rndis_config_register(struct usb_composite_dev *cdev) |
| 198 | { | 198 | { |
| 199 | return 0; | 199 | return 0; |
| 200 | } | 200 | } |
| @@ -241,7 +241,7 @@ err_conf: | |||
| 241 | return ret; | 241 | return ret; |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | static int cdc_config_register(struct usb_composite_dev *cdev) | 244 | static __ref int cdc_config_register(struct usb_composite_dev *cdev) |
| 245 | { | 245 | { |
| 246 | static struct usb_configuration config = { | 246 | static struct usb_configuration config = { |
| 247 | .bConfigurationValue = MULTI_CDC_CONFIG_NUM, | 247 | .bConfigurationValue = MULTI_CDC_CONFIG_NUM, |
| @@ -256,7 +256,7 @@ static int cdc_config_register(struct usb_composite_dev *cdev) | |||
| 256 | 256 | ||
| 257 | #else | 257 | #else |
| 258 | 258 | ||
| 259 | static int cdc_config_register(struct usb_composite_dev *cdev) | 259 | static __ref int cdc_config_register(struct usb_composite_dev *cdev) |
| 260 | { | 260 | { |
| 261 | return 0; | 261 | return 0; |
| 262 | } | 262 | } |