diff options
| author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2019-06-06 11:58:04 +0300 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-11 09:48:22 +0100 |
| commit | 3723d3fe35f90fc8a12dada3a883543dc431b9bd (patch) | |
| tree | 81ea8c1010cabd8599efa52c86b807d0eabf83c2 /include | |
| parent | cfd77b2a0f135aefa48ae07f9ffd5723dedeeac8 (diff) | |
usb: chipidea: Fix enum name conflict
This fixes a compilation error:
CC drivers/rtc/rtc-lib.o
In file included from drivers/phy/ti/phy-omap-usb2.c:30:0:
./include/linux/phy/omap_control_phy.h:46:2: error: redeclaration of enumerator ‘USB_MODE_HOST’
USB_MODE_HOST,
^~~~~~~~~~~~~
In file included from ./include/linux/usb/otg.h:14:0,
from ./include/linux/phy/omap_usb.h:23,
from drivers/phy/ti/phy-omap-usb2.c:24:
./include/linux/usb/phy.h:69:2: note: previous definition of ‘USB_MODE_HOST’ was here
USB_MODE_HOST,
^~~~~~~~~~~~~
In file included from drivers/phy/ti/phy-omap-usb2.c:30:0:
./include/linux/phy/omap_control_phy.h:47:2: error: redeclaration of enumerator ‘USB_MODE_DEVICE’
USB_MODE_DEVICE,
^~~~~~~~~~~~~~~
In file included from ./include/linux/usb/otg.h:14:0,
from ./include/linux/phy/omap_usb.h:23,
from drivers/phy/ti/phy-omap-usb2.c:24:
./include/linux/usb/phy.h:70:2: note: previous definition of ‘USB_MODE_DEVICE’ was here
USB_MODE_DEVICE,
^~~~~~~~~~~~~~~
make[3]: *** [scripts/Makefile.build:328: drivers/phy/ti/phy-omap-usb2.o] Error 1
AR drivers/pps/clients/built-in.o
make[2]: *** [scripts/Makefile.build:587: drivers/phy/ti] Error 2
make[1]: *** [scripts/Makefile.build:587: drivers/phy] Error 2
make[1]: *** Waiting for unfinished jobs....
CC drivers/rtc/hctosys.o
Related to: #50570
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/phy.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index ef89950cb68a..178cc094e9d4 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -65,9 +65,9 @@ enum usb_otg_state { /* The usb role of phy to be working with */ enum usb_current_mode { - USB_MODE_NONE, - USB_MODE_HOST, - USB_MODE_DEVICE, + USB_CURRENT_MODE_NONE, + USB_CURRENT_MODE_HOST, + USB_CURRENT_MODE_DEVICE, }; struct usb_phy; |