[kernel] r21772 - in dists/trunk/linux/debian/config: . kernelarch-x86

Ben Hutchings benh at moszumanska.debian.org
Sun Sep 7 18:50:43 UTC 2014 

Author: benh
Date: Sun Sep  7 18:50:43 2014
New Revision: 21772

Log:
Move various i386-dependent config symbols into the appropriate config file

These now all have dependencies on X86_32 || COMPILE_TEST, so they
cannot be enabled on amd64.

Also remove the explicit disabling of these symbols at the top level.

Modified:
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/config/kernelarch-x86/config
   dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sun Sep  7 18:28:43 2014	(r21771)
+++ dists/trunk/linux/debian/config/config	Sun Sep  7 18:50:43 2014	(r21772)
@@ -174,8 +174,6 @@
 # CONFIG_PATA_ATIIXP is not set
 CONFIG_PATA_ATP867X=m
 CONFIG_PATA_CMD64X=m
-# CONFIG_PATA_CS5520 is not set
-# CONFIG_PATA_CS5530 is not set
 # CONFIG_PATA_CS5536 is not set
 # CONFIG_PATA_CYPRESS is not set
 # CONFIG_PATA_EFAR is not set
@@ -196,7 +194,6 @@
 # CONFIG_PATA_PDC_OLD is not set
 # CONFIG_PATA_RADISYS is not set
 CONFIG_PATA_RDC=m
-# CONFIG_PATA_SC1200 is not set
 CONFIG_PATA_SCH=m
 # CONFIG_PATA_SERVERWORKS is not set
 # CONFIG_PATA_SIL680 is not set
@@ -457,7 +454,6 @@
 # CONFIG_GPIO_CS5535 is not set
 # CONFIG_GPIO_AMD8111 is not set
 # CONFIG_GPIO_INTEL_MID is not set
-# CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_RDC321X is not set
 # CONFIG_GPIO_MAX7301 is not set
@@ -729,7 +725,6 @@
 CONFIG_I2C_ISCH=m
 CONFIG_I2C_NFORCE2_S4985=m
 # CONFIG_I2C_CBUS_GPIO is not set
-# CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_GPIO is not set
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
@@ -2045,7 +2040,6 @@
 CONFIG_VMWARE_BALLOON=m
 # CONFIG_BMP085_I2C is not set
 # CONFIG_BMP085_SPI is not set
-# CONFIG_PCH_PHUB is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_SRAM is not set
@@ -2231,7 +2225,6 @@
 CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
 # CONFIG_CAN_LEDS is not set
-# CONFIG_PCH_CAN is not set
 # CONFIG_CAN_DEBUG_DEVICES is not set
 
 ##
@@ -2506,11 +2499,6 @@
 CONFIG_NET_VENDOR_OKI=y
 
 ##
-## file: drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
-##
-# CONFIG_PCH_GBE is not set
-
-##
 ## file: drivers/net/ethernet/packetengines/Kconfig
 ##
 CONFIG_NET_PACKET_ENGINE=y
@@ -3721,7 +3709,6 @@
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_IFX6X60 is not set
-# CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIAL_ARC is not set
 CONFIG_SERIAL_RP2=m

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Sun Sep  7 18:28:43 2014	(r21771)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sun Sep  7 18:50:43 2014	(r21772)
@@ -194,8 +194,6 @@
 CONFIG_PATA_AMD=m
 CONFIG_PATA_ATIIXP=m
 CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
 CONFIG_PATA_EFAR=m
 CONFIG_PATA_HPT366=m
 CONFIG_PATA_HPT37X=m
@@ -204,7 +202,6 @@
 CONFIG_PATA_OLDPIIX=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_SC1200=m
 CONFIG_PATA_SERVERWORKS=m
 CONFIG_PATA_SIL680=m
 CONFIG_PATA_TRIFLEX=m
@@ -383,7 +380,6 @@
 ##
 CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOATDMA=m
-CONFIG_PCH_DMA=m
 CONFIG_NET_DMA=y
 
 ##
@@ -437,7 +433,6 @@
 # CONFIG_GPIO_ICH is not set
 # CONFIG_GPIO_LYNXPOINT is not set
 # CONFIG_GPIO_INTEL_MID is not set
-CONFIG_GPIO_PCH=m
 CONFIG_GPIO_ML_IOH=m
 
 ##
@@ -594,7 +589,6 @@
 #. Sony Vaio Duo 13".
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 CONFIG_I2C_DESIGNWARE_PCI=m
-CONFIG_I2C_EG20T=m
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_PCA_ISA=m
@@ -769,7 +763,6 @@
 CONFIG_PHANTOM=m
 CONFIG_CS5535_MFGPT=m
 CONFIG_HP_ILO=m
-CONFIG_PCH_PHUB=m
 
 ##
 ## file: drivers/misc/mei/Kconfig
@@ -899,11 +892,6 @@
 CONFIG_ARCNET_COM20020_CS=m
 
 ##
-## file: drivers/net/can/Kconfig
-##
-CONFIG_PCH_CAN=m
-
-##
 ## file: drivers/net/ethernet/Kconfig
 ##
 CONFIG_FEALNX=m
@@ -994,11 +982,6 @@
 CONFIG_FORCEDETH=m
 
 ##
-## file: drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
-##
-CONFIG_PCH_GBE=m
-
-##
 ## file: drivers/net/ethernet/realtek/Kconfig
 ##
 CONFIG_NET_VENDOR_REALTEK=y
@@ -1294,11 +1277,6 @@
 CONFIG_SFI=y
 
 ##
-## file: drivers/spi/Kconfig
-##
-CONFIG_SPI_TOPCLIFF_PCH=m
-
-##
 ## file: drivers/staging/comedi/Kconfig
 ##
 CONFIG_COMEDI=m
@@ -1537,7 +1515,6 @@
 ## file: drivers/tty/serial/Kconfig
 ##
 CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_PCH_UART=m
 
 ##
 ## file: drivers/tty/serial/8250/Kconfig
@@ -1674,7 +1651,6 @@
 CONFIG_SC1200_WDT=m
 CONFIG_NV_TCO=m
 CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
 CONFIG_CPU5_WDT=m
 CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32	Sun Sep  7 18:28:43 2014	(r21771)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32	Sun Sep  7 18:50:43 2014	(r21772)
@@ -65,8 +65,11 @@
 ##
 ## file: drivers/ata/Kconfig
 ##
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
 CONFIG_PATA_CS5535=m
 CONFIG_PATA_CS5536=m
+CONFIG_PATA_SC1200=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_OPTI=m
 CONFIG_PATA_LEGACY=m
@@ -129,10 +132,16 @@
 CONFIG_CRYPTO_DEV_GEODE=m
 
 ##
+## file: drivers/dma/Kconfig
+##
+CONFIG_PCH_DMA=m
+
+##
 ## file: drivers/gpio/Kconfig
 ##
 CONFIG_GPIO_VX855=m
 CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_PCH=m
 
 ##
 ## file: drivers/gpu/drm/Kconfig
@@ -142,6 +151,7 @@
 ##
 ## file: drivers/i2c/busses/Kconfig
 ##
+CONFIG_I2C_EG20T=m
 CONFIG_I2C_PXA=m
 CONFIG_SCx200_I2C=m
 CONFIG_SCx200_I2C_SCL=12
@@ -215,6 +225,7 @@
 ##
 CONFIG_CS5535_MFGPT=m
 CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_PCH_PHUB=m
 
 ##
 ## file: drivers/mtd/maps/Kconfig
@@ -229,6 +240,11 @@
 CONFIG_ARCNET_COM20020_ISA=m
 
 ##
+## file: drivers/net/can/Kconfig
+##
+CONFIG_PCH_CAN=m
+
+##
 ## file: drivers/net/can/cc770/Kconfig
 ##
 CONFIG_CAN_CC770=m
@@ -274,6 +290,11 @@
 CONFIG_NET_VENDOR_FUJITSU=y
 
 ##
+## file: drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
+##
+CONFIG_PCH_GBE=m
+
+##
 ## file: drivers/net/ethernet/realtek/Kconfig
 ##
 CONFIG_8139TOO_PIO=y
@@ -369,6 +390,11 @@
 CONFIG_PCMCIA_NINJA_SCSI=m
 
 ##
+## file: drivers/spi/Kconfig
+##
+CONFIG_SPI_TOPCLIFF_PCH=m
+
+##
 ## file: drivers/staging/comedi/Kconfig
 ##
 CONFIG_COMEDI_ISA_DRIVERS=y
@@ -424,6 +450,11 @@
 # CONFIG_ISI is not set
 
 ##
+## file: drivers/tty/serial/Kconfig
+##
+CONFIG_SERIAL_PCH_UART=m
+
+##
 ## file: drivers/tty/serial/8250/Kconfig
 ##
 CONFIG_SERIAL_8250_EXAR_ST16C554=m
@@ -448,6 +479,7 @@
 ## file: drivers/watchdog/Kconfig
 ##
 CONFIG_SCx200_WDT=m
+CONFIG_SBC8360_WDT=m
 CONFIG_SBC7240_WDT=m
 CONFIG_PCWATCHDOG=m
 CONFIG_MIXCOMWD=m

More information about the Kernel-svn-changes mailing list