diff --git a/config-generic b/config-generic index d5730dff1..f0278813f 100644 --- a/config-generic +++ b/config-generic @@ -3021,7 +3021,6 @@ CONFIG_VIDEO_ZORAN_DC30=m CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_ZORAN_ZR36060=m -# CONFIG_V4L_ISA_PARPORT_DRIVERS is not set # CONFIG_V4L_PLATFORM_DRIVERS is not set CONFIG_VIDEO_FB_IVTV=m CONFIG_VIDEO_SAA7164=m @@ -3347,15 +3346,11 @@ CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 CONFIG_SND_DRIVERS=y -# -# ISA devices -# -CONFIG_SND_AD1889=m - # # PCI devices # CONFIG_SND_PCI=y +CONFIG_SND_AD1889=m CONFIG_SND_ALI5451=m CONFIG_SND_ALS300=m CONFIG_SND_ALS4000=m diff --git a/config-powerpc32-generic b/config-powerpc32-generic index 61e3236b1..10e02fb7b 100644 --- a/config-powerpc32-generic +++ b/config-powerpc32-generic @@ -138,7 +138,6 @@ CONFIG_VIRTUALIZATION=y # PPC gets sad with debug alloc (bz 448598) # CONFIG_DEBUG_PAGEALLOC is not set -CONFIG_SND_ISA=y CONFIG_CRYPTO_DEV_TALITOS=m # CONFIG_FSL_EMB_PERFMON is not set diff --git a/config-x86-32-generic b/config-x86-32-generic index bdf291a28..6adcfb524 100644 --- a/config-x86-32-generic +++ b/config-x86-32-generic @@ -115,9 +115,6 @@ CONFIG_PC8736x_GPIO=m CONFIG_CS5535_GPIO=m CONFIG_GPIO_SCH=m -CONFIG_SND_ISA=y -CONFIG_SND_ES18XX=m - CONFIG_HW_RANDOM_GEODE=m CONFIG_TC1100_WMI=m diff --git a/config-x86-generic b/config-x86-generic index bcac9b274..2b183a4e5 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -186,9 +186,6 @@ CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_SCHED_MC=y -CONFIG_SND_ISA=y -CONFIG_SND_ES18XX=m - CONFIG_TCG_INFINEON=m CONFIG_HW_RANDOM_INTEL=m