[linux] 01/01: [ppc64el] Disable IBMEBUS; this bus does not exist on POWER8 systems

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit aca7f25415d50b32cc701be80d1831b7dbbb0bd1
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Feb 2 00:51:20 2017 +0000

    [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.
---
 debian/changelog                                     |  1 +
 debian/config/kernelarch-powerpc/config-arch-64      |  1 -
 debian/config/kernelarch-powerpc/config-arch-64-be   | 10 ++++++++++
 debian/installer/ppc64el/modules/ppc64el/nic-modules |  1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 94db72a..d092c28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index 0bd0fa2..ac68835 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -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
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be
index 71259df..41663eb 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-be
+++ b/debian/config/kernelarch-powerpc/config-arch-64-be
@@ -43,6 +43,11 @@ CONFIG_PS3_VRAM=m
 CONFIG_PS3_LPM=m
 
 ##
+## file: arch/powerpc/platforms/pseries/Kconfig
+##
+CONFIG_IBMEBUS=y
+
+##
 ## file: drivers/char/hw_random/Kconfig
 ##
 CONFIG_HW_RANDOM_PASEMI=m
@@ -71,6 +76,11 @@ CONFIG_WINDFARM_PM112=m
 CONFIG_WINDFARM_PM121=m
 
 ##
+## file: drivers/net/ethernet/ibm/Kconfig
+##
+CONFIG_EHEA=m
+
+##
 ## file: drivers/net/ethernet/pasemi/Kconfig
 ##
 CONFIG_PASEMI_MAC=m
diff --git a/debian/installer/ppc64el/modules/ppc64el/nic-modules b/debian/installer/ppc64el/modules/ppc64el/nic-modules
index 8ef5be2..f8c5bb0 100644
--- a/debian/installer/ppc64el/modules/ppc64el/nic-modules
+++ b/debian/installer/ppc64el/modules/ppc64el/nic-modules
@@ -1,5 +1,6 @@
 #include "../../../ppc64/modules/ppc64/nic-modules"
 
 airport -
+ehea -
 ps3_gelic -
 spidernet -

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git