From: Aaro Koskinen Date: Mon, 29 Jul 2013 17:07:42 +0000 (+0300) Subject: staging: octeon-usb: use correct board type for EdgeRouter Lite X-Git-Tag: v3.12-rc1~183^2~474 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6ba63fce2ccf3f48d0d643bd93d32509c90cade;p=thirdparty%2Fkernel%2Flinux.git staging: octeon-usb: use correct board type for EdgeRouter Lite Use CVMX_BOARD_TYPE_UBNT_E100 for EdgeRouter Lite. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/octeon-usb/cvmx-usb.c b/drivers/staging/octeon-usb/cvmx-usb.c index bf366495fdd17..6c7bcf33ee342 100644 --- a/drivers/staging/octeon-usb/cvmx-usb.c +++ b/drivers/staging/octeon-usb/cvmx-usb.c @@ -280,14 +280,9 @@ static int octeon_usb_get_clock_type(void) case CVMX_BOARD_TYPE_LANAI2_A: case CVMX_BOARD_TYPE_LANAI2_U: case CVMX_BOARD_TYPE_LANAI2_G: + case CVMX_BOARD_TYPE_UBNT_E100: return USB_CLOCK_TYPE_CRYSTAL_12; } - - /* FIXME: This should use CVMX_BOARD_TYPE_UBNT_E100 */ - if (OCTEON_IS_MODEL(OCTEON_CN50XX) && - cvmx_sysinfo_get()->board_type == 20002) - return USB_CLOCK_TYPE_CRYSTAL_12; - return USB_CLOCK_TYPE_REF_48; }