[kernel] Disable ISA
Dave Jones
davej at fedoraproject.org
Mon Jan 16 21:14:32 UTC 2012
commit 36c7a65617e8190a7f6ca0cc8faab9dcf19eeeb5
Author: Dave Jones <davej at redhat.com>
Date: Mon Jan 16 16:14:17 2012 -0500
Disable ISA
TODO | 4 +-
config-arm-generic | 3 +
config-generic | 146 +------------------------------------------------
config-x86-generic | 5 ++
config-x86_64-generic | 2 -
kernel.spec | 3 +
6 files changed, 17 insertions(+), 146 deletions(-)
---
diff --git a/TODO b/TODO
index bfd5e67..2ab00f1 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,7 @@
Config TODOs:
-* At some point disable CONFIG_ISA everywhere. F17 ?
+* disable CONFIG_ISA everywhere.
+* review & disable a bunch of the I2C, RTC, DVB, SOUND options.
+* clean up CONFIG_BLK_DEV_AMD74XX
Spec file TODOs:
diff --git a/config-arm-generic b/config-arm-generic
index 558c7c4..5614558 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -194,3 +194,6 @@ CONFIG_ARM_ERRATA_751472=y
# CONFIG_MX3_IPU is not set
# CONFIG_MX3_IPU_IRQS is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_CS89x0 is not set
+
diff --git a/config-generic b/config-generic
index 7862c52..02674b4 100644
--- a/config-generic
+++ b/config-generic
@@ -83,9 +83,6 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
CONFIG_PCI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_PCI_STUB=y
@@ -103,8 +100,7 @@ CONFIG_PCIEAER_INJECT=m
CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_ISA=y
-# CONFIG_EISA is not set
+# CONFIG_ISA is not set
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
@@ -231,19 +227,6 @@ CONFIG_PARPORT_PC_PCMCIA=m
CONFIG_PARPORT_1284=y
# CONFIG_PARPORT_AX88796 is not set
-#
-# Plug and Play support
-#
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG is not set
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-
CONFIG_ACPI_PCI_SLOT=y
CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_HOTPLUG_PCI_ACPI_IBM=m
@@ -253,7 +236,6 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m
#
CONFIG_BLK_DEV=y
CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
# CONFIG_PARIDE is not set
CONFIG_BLK_CPQ_DA=m
@@ -306,7 +288,6 @@ CONFIG_IDE_TASK_IOCTL=y
#
CONFIG_BLK_DEV_CMD640=y
CONFIG_BLK_DEV_CMD640_ENHANCED=y
-CONFIG_BLK_DEV_IDEPNP=y
CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=y
@@ -405,7 +386,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m
CONFIG_SCSI_LOWLEVEL=y
CONFIG_BLK_DEV_3W_XXXX_RAID=m
CONFIG_SCSI_3W_9XXX=m
-# CONFIG_SCSI_7000FASST is not set
CONFIG_SCSI_ACARD=m
CONFIG_SCSI_AACRAID=m
CONFIG_SCSI_AIC7XXX=m
@@ -493,22 +473,6 @@ CONFIG_SCSI_LPFC=m
# PCMCIA SCSI adapter support
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-# ISA SCSI Controllers. Sorry your life sucks.
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-
-
CONFIG_ATA=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_VERBOSE_ERROR=y
@@ -535,6 +499,7 @@ CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
CONFIG_SATA_ACARD_AHCI=m
+# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
@@ -555,14 +520,11 @@ CONFIG_PATA_HPT37X=m
CONFIG_PATA_HPT3X2N=m
CONFIG_PATA_HPT3X3=m
# CONFIG_PATA_HPT3X3_DMA is not set
-# CONFIG_PATA_ISAPNP is not set
CONFIG_PATA_IT821X=m
CONFIG_PATA_IT8213=m
CONFIG_PATA_JMICRON=m
-# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_NINJA32=m
CONFIG_PATA_MARVELL=m
-# CONFIG_PATA_WINBOND_VLB is not set
CONFIG_PATA_MPIIX=m
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NS87410=m
@@ -572,7 +534,6 @@ CONFIG_PATA_OPTI=m
CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_QDI=m
# CONFIG_PATA_RADISYS is not set
CONFIG_PATA_RDC=m
# CONFIG_PATA_RZ1000 is not set
@@ -1102,7 +1063,6 @@ CONFIG_MACVTAP=m
CONFIG_EQUALIZER=m
CONFIG_TUN=m
CONFIG_VETH=m
-CONFIG_NET_SB1000=m
#
# ATM
@@ -1171,7 +1131,6 @@ CONFIG_ACENIC=m
# CONFIG_ACENIC_OMIT_TIGON_I is not set
CONFIG_NET_VENDOR_AMD=y
-# CONFIG_LANCE is not set
CONFIG_PCNET32=m
CONFIG_AMD8111_ETH=m
CONFIG_PCMCIA_NMCLAN=m
@@ -1192,13 +1151,10 @@ CONFIG_CHELSIO_T3=m
CONFIG_CHELSIO_T4=m
CONFIG_CHELSIO_T4VF=m
-# CONFIG_NET_VENDOR_CIRRUS is not set
-#
CONFIG_NET_VENDOR_CISCO=y
CONFIG_ENIC=m
CONFIG_NET_VENDOR_DEC=y
-CONFIG_EWRK3=m
#
# Tulip family network device support
#
@@ -1269,7 +1225,6 @@ CONFIG_NATSEMI=m
CONFIG_NS83820=m
CONFIG_NET_VENDOR_8390=y
-# CONFIG_AC3200 is not set
CONFIG_PCMCIA_AXNET=m
CONFIG_NE2K_PCI=m
CONFIG_NE3210=m
@@ -1314,7 +1269,6 @@ CONFIG_SIS900=m
CONFIG_SIS190=m
CONFIG_NET_VENDOR_SMSC=y
-# CONFIG_SMC9194 is not set
CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
CONFIG_SMSC9420=m
@@ -1634,10 +1588,6 @@ CONFIG_ROSE=m
CONFIG_MKISS=m
CONFIG_6PACK=m
CONFIG_BPQETHER=m
-CONFIG_SCC=m
-CONFIG_DMASCC=m
-# CONFIG_SCC_DELAY is not set
-CONFIG_SCC_TRXECHO=y
CONFIG_BAYCOM_SER_FDX=m
CONFIG_BAYCOM_SER_HDX=m
CONFIG_BAYCOM_PAR=m
@@ -1973,7 +1923,6 @@ CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GUNZE=m
# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
-CONFIG_TOUCHSCREEN_HTCPEN=m
CONFIG_TOUCHSCREEN_INEXIO=m
CONFIG_TOUCHSCREEN_MTOUCH=m
CONFIG_TOUCHSCREEN_MCS5000=m
@@ -2113,7 +2062,6 @@ CONFIG_I2C_ALGOPCA=m
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_ELEKTOR is not set
# CONFIG_I2C_I801 is not set
# CONFIG_I2C_ISCH is not set
# CONFIG_I2C_NFORCE2_S4985 is not set
@@ -2130,7 +2078,6 @@ CONFIG_I2C_NFORCE2=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PASEMI=m
-CONFIG_I2C_PCA_ISA=m
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_SCx200_ACB is not set
@@ -2312,7 +2259,6 @@ CONFIG_WDTPCI=m
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_EUROTECH_WDT is not set
CONFIG_IB700_WDT=m
-# CONFIG_MIXCOMWD is not set
# CONFIG_SCx200_WDT is not set
# CONFIG_60XX_WDT is not set
CONFIG_W83877F_WDT=m
@@ -2335,7 +2281,6 @@ CONFIG_IT8712F_WDT=m
CONFIG_SMSC_SCH311X_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_PCIPCWATCHDOG=m
-# CONFIG_PCWATCHDOG is not set
CONFIG_USBPCWATCHDOG=m
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
CONFIG_WM8350_WATCHDOG=m
@@ -2343,7 +2288,6 @@ CONFIG_WM831X_WATCHDOG=m
# CONFIG_MAX63XX_WATCHDOG is not set
# CONFIG_DW_WATCHDOG is not set
CONFIG_W83697UG_WDT=m
-# CONFIG_WDT is not set
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2396,7 +2340,6 @@ CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_DTLK=m
CONFIG_R3964=m
# CONFIG_APPLICOM is not set
# CONFIG_SONYPI is not set
@@ -2855,7 +2798,6 @@ CONFIG_FB_UDL=m
CONFIG_VGA_CONSOLE=y
CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-# CONFIG_MDA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
@@ -2916,17 +2858,11 @@ CONFIG_SND_DRIVERS=y
# ISA devices
#
CONFIG_SND_AD1889=m
-# CONFIG_SND_WAVEFRONT is not set
-# CONFIG_SND_MSND_PINNACLE is not set
-# CONFIG_SND_MSND_CLASSIC is not set
-# CONFIG_SND_AZT1605 is not set
-# CONFIG_SND_AZT2316 is not set
#
# PCI devices
#
CONFIG_SND_PCI=y
-CONFIG_SND_ADLIB=m
CONFIG_SND_ALI5451=m
CONFIG_SND_ALS300=m
CONFIG_SND_ALS4000=m
@@ -2989,7 +2925,6 @@ CONFIG_SND_INTEL8X0M=m
CONFIG_SND_KORG1212=m
CONFIG_SND_MAESTRO3=m
CONFIG_SND_MAESTRO3_INPUT=y
-CONFIG_SND_MIRO=m
CONFIG_SND_MIXART=m
CONFIG_SND_NM256=m
CONFIG_SND_OXYGEN=m
@@ -2999,7 +2934,6 @@ CONFIG_SND_PCXHR=m
CONFIG_SND_RIPTIDE=m
CONFIG_SND_RME96=m
CONFIG_SND_RME9652=m
-CONFIG_SND_SC6000=m
CONFIG_SND_SIS7019=m
CONFIG_SND_SONICVIBES=m
CONFIG_SND_HDSP=m
@@ -4015,89 +3949,17 @@ CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
-## BEGIN ISA Junk.
-
-CONFIG_I82365=m
-# CONFIG_TCIC is not set
-# CONFIG_PCMCIA_PROBE is not set
-# CONFIG_LTPC is not set
-# CONFIG_COPS is not set
-
-# CONFIG_EL1 is not set
-# CONFIG_EL2 is not set
-CONFIG_EL3=m
-# CONFIG_3C515 is not set
CONFIG_NET_VENDOR_SMC=y
-# CONFIG_WD80x3 is not set
-CONFIG_ULTRA=m
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_NI65 is not set
-# CONFIG_DEPCA is not set
-CONFIG_NET_ISA=y
-CONFIG_NE2000=m
-# CONFIG_E2100 is not set
-# CONFIG_HPLAN_PLUS is not set
-# CONFIG_HPLAN is not set
# CONFIG_IBMTR is not set
# CONFIG_SKISA is not set
# CONFIG_PROTEON is not set
# CONFIG_SMCTR is not set
-# CONFIG_HISAX_16_0 is not set
-# CONFIG_HISAX_AVM_A1 is not set
-# CONFIG_HISAX_IX1MICROR2 is not set
-# CONFIG_HISAX_ASUSCOM is not set
-# CONFIG_HISAX_TELEINT is not set
-# CONFIG_HISAX_HFCS is not set
-# CONFIG_HISAX_SPORTSTER is not set
-# CONFIG_HISAX_MIC is not set
-# CONFIG_HISAX_ISURF is not set
-# CONFIG_HISAX_HSTSAPHIR is not set
-# CONFIG_ISDN_DRV_ICN is not set
-# CONFIG_ISDN_DRV_PCBIT is not set
-# CONFIG_ISDN_DRV_SC is not set
-# CONFIG_ISDN_DRV_ACT2000 is not set
-# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
-# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
-
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_ATIXL is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
-# CONFIG_SERIAL_8250_FOURPORT is not set
-# CONFIG_SERIAL_8250_ACCENT is not set
-# CONFIG_SERIAL_8250_BOCA is not set
-# CONFIG_SERIAL_8250_HUB6 is not set
-# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
+# CONFIG_MOUSE_ATIXL is not set
# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_SND_OPL4_LIB is not set
-# CONFIG_SND_AD1816A is not set
-# CONFIG_SND_AD1848 is not set
-# CONFIG_SND_CS4231 is not set
-CONFIG_SND_CS4236=m
-# CONFIG_SND_ES1688 is not set
-# CONFIG_SND_ES18XX is not set
-# CONFIG_SND_GUSCLASSIC is not set
-# CONFIG_SND_GUSEXTREME is not set
-# CONFIG_SND_GUSMAX is not set
-# CONFIG_SND_INTERWAVE is not set
-# CONFIG_SND_JAZZ16 is not set
-# CONFIG_SND_INTERWAVE_STB is not set
-# CONFIG_SND_OPTI92X_AD1848 is not set
-# CONFIG_SND_OPTI92X_CS4231 is not set
-# CONFIG_SND_OPTI93X is not set
-# CONFIG_SND_SB8 is not set
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-# CONFIG_SND_SB16_CSP is not set
-# CONFIG_SND_ALS100 is not set
-# CONFIG_SND_AZT2320 is not set
-# CONFIG_SND_CMI8330 is not set
-CONFIG_SND_OPL3SA2=m
-# CONFIG_SND_SSCAPE is not set
CONFIG_SND_DARLA20=m
CONFIG_SND_GINA20=m
CONFIG_SND_LAYLA20=m
@@ -4114,8 +3976,6 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGODJX=m
# CONFIG_SND_SOC is not set
-## END of ISA options.
-
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
CONFIG_NEW_LEDS=y
diff --git a/config-x86-generic b/config-x86-generic
index fec30ea..230c788 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -21,6 +21,11 @@ CONFIG_X86_CPUID=y
CONFIG_EDD=m
# CONFIG_EDD_OFF is not set
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+# CONFIG_NET_SB1000 is not set
+
CONFIG_MTRR=y
CONFIG_MTRR_SANITIZER=y
CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 02b440d..f5bbf9f 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -34,8 +34,6 @@ CONFIG_ACPI_HOTPLUG_MEMORY=m
# SHPC has half-arsed PCI probing, which makes it load on too many systems
CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_PNP=y
-
# Really ? not 32bit only ?
CONFIG_BLK_DEV_AMD74XX=y
diff --git a/kernel.spec b/kernel.spec
index 3d21966..1c09a95 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2322,6 +2322,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Jan 16 2012 Dave Jones <davej at redhat.com>
+- Disable ISA
+
* Mon Jan 16 2012 John W. Linville <linville at redhat.com>
- Re-enable CONFIG_BRCMFMAC builds (found work-around for GCC 4.7 builds)
More information about the scm-commits
mailing list