[ppc64el] Disable IBMEBUS; this bus does not exist on POWER8 systems
In 4.10 its dependencies are changed accordingly. We might as well disable it here as well. Also explicitly disable EHEA, which depends on IBMEBUS, and exclude ehea from nic-modules.
This commit is contained in:
parent
3ddefd2502
commit
aca7f25415
|
@ -9,6 +9,7 @@ linux (4.9.6-4) UNRELEASED; urgency=medium
|
|||
USB_CONFIGFS_{SERIAL,ACM,OBEX,NCM,ECM,ECM_SUBSET,RNDIS,EEM,PHONET,MASS_STORAGE},
|
||||
USB_CONFIGFS_F_{LB_SS,LS,UAC1,UAC2,MIDI,HID,UVC,PRINTER}, USB_ETH_RNDIS,
|
||||
USB_FUNCTIONFS_{ETH,RNDIS,GENERIC} (thanks to Riku Voipio)
|
||||
* [ppc64el] Disable IBMEBUS; this bus does not exist on POWER8 systems
|
||||
|
||||
[ Roger Shimizu ]
|
||||
* [armel] ARM: dts: orion5x-lschl: Fix model name
|
||||
|
|
|
@ -102,7 +102,6 @@ CONFIG_MTD_POWERNV_FLASH=m
|
|||
## file: drivers/net/ethernet/ibm/Kconfig
|
||||
##
|
||||
CONFIG_IBMVETH=m
|
||||
CONFIG_EHEA=m
|
||||
|
||||
##
|
||||
## file: drivers/net/ethernet/ibm/emac/Kconfig
|
||||
|
|
|
@ -42,6 +42,11 @@ CONFIG_PS3_FLASH=m
|
|||
CONFIG_PS3_VRAM=m
|
||||
CONFIG_PS3_LPM=m
|
||||
|
||||
##
|
||||
## file: arch/powerpc/platforms/pseries/Kconfig
|
||||
##
|
||||
CONFIG_IBMEBUS=y
|
||||
|
||||
##
|
||||
## file: drivers/char/hw_random/Kconfig
|
||||
##
|
||||
|
@ -70,6 +75,11 @@ CONFIG_WINDFARM_PM91=m
|
|||
CONFIG_WINDFARM_PM112=m
|
||||
CONFIG_WINDFARM_PM121=m
|
||||
|
||||
##
|
||||
## file: drivers/net/ethernet/ibm/Kconfig
|
||||
##
|
||||
CONFIG_EHEA=m
|
||||
|
||||
##
|
||||
## file: drivers/net/ethernet/pasemi/Kconfig
|
||||
##
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#include "../../../ppc64/modules/ppc64/nic-modules"
|
||||
|
||||
airport -
|
||||
ehea -
|
||||
ps3_gelic -
|
||||
spidernet -
|
||||
|
|
Loading…
Reference in New Issue