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/host/fsl-mph-dr-of.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/host/fsl-mph-dr-of.c')
| -rw-r--r-- | drivers/usb/host/fsl-mph-dr-of.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c index 9e0020d9e4c8..abd5050a4899 100644 --- a/drivers/usb/host/fsl-mph-dr-of.c +++ b/drivers/usb/host/fsl-mph-dr-of.c | |||
| @@ -24,7 +24,7 @@ struct fsl_usb2_dev_data { | |||
| 24 | enum fsl_usb2_operating_modes op_mode; /* operating mode */ | 24 | enum fsl_usb2_operating_modes op_mode; /* operating mode */ |
| 25 | }; | 25 | }; |
| 26 | 26 | ||
| 27 | struct fsl_usb2_dev_data dr_mode_data[] = { | 27 | static struct fsl_usb2_dev_data dr_mode_data[] = { |
| 28 | { | 28 | { |
| 29 | .dr_mode = "host", | 29 | .dr_mode = "host", |
| 30 | .drivers = { "fsl-ehci", NULL, NULL, }, | 30 | .drivers = { "fsl-ehci", NULL, NULL, }, |
| @@ -42,7 +42,7 @@ struct fsl_usb2_dev_data dr_mode_data[] = { | |||
| 42 | }, | 42 | }, |
| 43 | }; | 43 | }; |
| 44 | 44 | ||
| 45 | struct fsl_usb2_dev_data *get_dr_mode_data(struct device_node *np) | 45 | static struct fsl_usb2_dev_data *get_dr_mode_data(struct device_node *np) |
| 46 | { | 46 | { |
| 47 | const unsigned char *prop; | 47 | const unsigned char *prop; |
| 48 | int i; | 48 | int i; |
| @@ -75,7 +75,7 @@ static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type) | |||
| 75 | return FSL_USB2_PHY_NONE; | 75 | return FSL_USB2_PHY_NONE; |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | struct platform_device *fsl_usb2_device_register( | 78 | static struct platform_device *fsl_usb2_device_register( |
| 79 | struct platform_device *ofdev, | 79 | struct platform_device *ofdev, |
| 80 | struct fsl_usb2_platform_data *pdata, | 80 | struct fsl_usb2_platform_data *pdata, |
| 81 | const char *name, int id) | 81 | const char *name, int id) |