diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/octeon/cvmx-helper-board.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/octeon/cvmx-helper-board.h')
-rw-r--r-- | drivers/staging/octeon/cvmx-helper-board.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/staging/octeon/cvmx-helper-board.h b/drivers/staging/octeon/cvmx-helper-board.h index dc20b01..611a8e0 100644 --- a/drivers/staging/octeon/cvmx-helper-board.h +++ b/drivers/staging/octeon/cvmx-helper-board.h @@ -37,13 +37,6 @@ #include "cvmx-helper.h" typedef enum { - USB_CLOCK_TYPE_REF_12, - USB_CLOCK_TYPE_REF_24, - USB_CLOCK_TYPE_REF_48, - USB_CLOCK_TYPE_CRYSTAL_12, -} cvmx_helper_board_usb_clock_types_t; - -typedef enum { set_phy_link_flags_autoneg = 0x1, set_phy_link_flags_flow_control_dont_touch = 0x0 << 1, set_phy_link_flags_flow_control_enable = 0x1 << 1, @@ -155,26 +148,4 @@ extern int __cvmx_helper_board_interface_probe(int interface, */ extern int __cvmx_helper_board_hardware_enable(int interface); -/** - * Gets the clock type used for the USB block based on board type. - * Used by the USB code for auto configuration of clock type. - * - * Returns USB clock type enumeration - */ -cvmx_helper_board_usb_clock_types_t -__cvmx_helper_board_usb_get_clock_type(void); - -/** - * Adjusts the number of available USB ports on Octeon based on board - * specifics. - * - * @supported_ports: expected number of ports based on chip type; - * - * - * Returns number of available usb ports, based on board specifics. - * Return value is supported_ports if function does not - * override. - */ -int __cvmx_helper_board_usb_get_num_ports(int supported_ports); - #endif /* __CVMX_HELPER_BOARD_H__ */ |