[linux] 06/06: [ppc64el] Explicitly limit IBMEBUS, EHEA to big-endian configurations

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit 8dede6cae95f7bab8ae184b64bd93291077f1c34
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Feb 1 23:35:16 2017 +0000

    [ppc64el] Explicitly limit IBMEBUS, EHEA to big-endian configurations
    
    From 4.10, IBMEBUS cannot be enabled in little-endian configurations
    and EHEA depends on it.  Adjust our configuration so it's obvious
    we don't intend otherwise.
---
 debian/config/kernelarch-powerpc/config-arch-64    |  2 --
 debian/config/kernelarch-powerpc/config-arch-64-be | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index fe7a967..09595fc 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -45,7 +45,6 @@ CONFIG_PPC_PSERIES=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_SCANLOG=m
 # CONFIG_LPARCFG is not set
-CONFIG_IBMEBUS=y
 
 ##
 ## file: block/partitions/Kconfig
@@ -102,7 +101,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

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