[linux] 04/04: Move config for VMware paravirtual drivers to kernelarch-x86

[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 7fa9f31f932710ebde1d88e919c41847594d0973
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Oct 4 02:50:39 2015 +0100

    Move config for VMware paravirtual drivers to kernelarch-x86
    
    These currently can't be enabled, and certainly wouldn't be useful,
    on any other architecture.
---
 debian/config/config                | 2 --
 debian/config/kernelarch-x86/config | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/config/config b/debian/config/config
index 059260c..7c49ad1 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2236,7 +2236,6 @@ CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_TI_DAC7512=m
-CONFIG_VMWARE_BALLOON=m
 # CONFIG_BMP085_I2C is not set
 # CONFIG_BMP085_SPI is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
@@ -3611,7 +3610,6 @@ CONFIG_SCSI_AACRAID=m
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_HPTIOP=m
-CONFIG_VMWARE_PVSCSI=m
 CONFIG_XEN_SCSI_FRONTEND=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 1acdb90..58c9be3 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -850,6 +850,7 @@ CONFIG_IBM_ASM=m
 CONFIG_PHANTOM=m
 CONFIG_CS5535_MFGPT=m
 CONFIG_HP_ILO=m
+CONFIG_VMWARE_BALLOON=m
 
 ##
 ## file: drivers/misc/mei/Kconfig
@@ -1341,6 +1342,7 @@ CONFIG_SCSI_DPT_I2O=m
 CONFIG_SCSI_ARCMSR=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_FLASHPOINT is not set
+CONFIG_VMWARE_PVSCSI=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_EATA=m

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