Commit 105f3fd2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'staging-octeon' of... 


Merge branch 'staging-octeon' of gitolite.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging into usb-next

This merges the movement of the octeon-usb driver out of
drivers/staging/ into drivers/usb.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

* 'staging-octeon' of gitolite.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging:
  staging: octeon-usb: move driver out of staging
parents 2c8845fe 9dbdac02

arch/mips/configs/cavium_octeon_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_DS1307=y

CONFIG_STAGING=y

CONFIG_OCTEON_ETHERNET=y

CONFIG_OCTEON_USB=y

CONFIG_USB_OCTEON_HCD=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_RAS=y

CONFIG_EXT4_FS=y

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ source "drivers/staging/rts5208/Kconfig" 


source "drivers/staging/octeon/Kconfig"



source "drivers/staging/octeon-usb/Kconfig"



source "drivers/staging/vt6655/Kconfig"



source "drivers/staging/vt6656/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ obj-$(CONFIG_R8712U) += rtl8712/ 
obj-$(CONFIG_R8188EU)		+= r8188eu/

obj-$(CONFIG_RTS5208)		+= rts5208/

obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/

obj-$(CONFIG_OCTEON_USB)	+= octeon-usb/

obj-$(CONFIG_VT6655)		+= vt6655/

obj-$(CONFIG_VT6656)		+= vt6656/

obj-$(CONFIG_VME_BUS)		+= vme_user/

drivers/staging/octeon-usb/Kconfig

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config OCTEON_USB

	tristate "Cavium Networks Octeon USB support"

	depends on CAVIUM_OCTEON_SOC && USB

	help

	  This driver supports USB host controller on some Cavium

	  Networks' products in the Octeon family.



	  To compile this driver as a module, choose M here. The module

	  will be called octeon-hcd.

drivers/staging/octeon-usb/Makefile

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-${CONFIG_OCTEON_USB} := octeon-hcd.o