diff --git a/configs/base-generic/CONFIG_SOUND_PRIME b/configs/base-generic/CONFIG_SOUND_PRIME deleted file mode 100644 index 7a8a0ab6b..000000000 --- a/configs/base-generic/CONFIG_SOUND_PRIME +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_SOUND_PRIME is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index fe72ca9b0..23822f58a 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -5445,7 +5445,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPARSE_IRQ=y CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_SPARSE_RCU_POINTER=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 9dfe9ecf8..a6568bc2c 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -5422,7 +5422,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPARSE_IRQ=y CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_SPARSE_RCU_POINTER=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index f9ef48e18..af5cc19aa 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -5906,7 +5906,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPARSE_RCU_POINTER=y # CONFIG_SPEAKUP is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 526775fb2..5181192f9 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -5522,7 +5522,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPARSE_RCU_POINTER=y # CONFIG_SPEAKUP is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index fcf299408..b10301172 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -5499,7 +5499,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPARSE_RCU_POINTER=y # CONFIG_SPEAKUP is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index b4eefea4e..b1eb0763b 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -5883,7 +5883,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPARSE_RCU_POINTER=y # CONFIG_SPEAKUP is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index d9cc0cedb..f82e625f8 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -5144,7 +5144,6 @@ CONFIG_SONYPI_COMPAT=y CONFIG_SONYPI=m CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SP5100_TCO=m CONFIG_SPARSE_IRQ=y CONFIG_SPARSE_RCU_POINTER=y diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 55205f228..7e9f70877 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -5166,7 +5166,6 @@ CONFIG_SONYPI_COMPAT=y CONFIG_SONYPI=m CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SP5100_TCO=m CONFIG_SPARSE_IRQ=y CONFIG_SPARSE_RCU_POINTER=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 4c8b08ae2..2c395f473 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -5166,7 +5166,6 @@ CONFIG_SONYPI_COMPAT=y CONFIG_SONYPI=m CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SP5100_TCO=m CONFIG_SPARSE_IRQ=y CONFIG_SPARSE_RCU_POINTER=y diff --git a/kernel-i686.config b/kernel-i686.config index 2d87d7de3..cb2fb4522 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -5144,7 +5144,6 @@ CONFIG_SONYPI_COMPAT=y CONFIG_SONYPI=m CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SP5100_TCO=m CONFIG_SPARSE_IRQ=y CONFIG_SPARSE_RCU_POINTER=y diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 60eaaa89a..d06b3bcb1 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -4947,7 +4947,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPAPR_TCE_IOMMU=y CONFIG_SPARSE_IRQ=y CONFIG_SPARSEMEM_VMEMMAP=y diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 075a0b129..a30e35305 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -4923,7 +4923,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPAPR_TCE_IOMMU=y CONFIG_SPARSE_IRQ=y CONFIG_SPARSEMEM_VMEMMAP=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 1bc309231..971d73555 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -4875,7 +4875,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPAPR_TCE_IOMMU=y CONFIG_SPARSE_IRQ=y CONFIG_SPARSEMEM_VMEMMAP=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index b94a28b08..5425caf1a 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -4851,7 +4851,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPAPR_TCE_IOMMU=y CONFIG_SPARSE_IRQ=y CONFIG_SPARSEMEM_VMEMMAP=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 8ffb8b577..535e84ae8 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -4775,7 +4775,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set # CONFIG_SOUND is not set CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPARSE_RCU_POINTER=y # CONFIG_SPEAKUP is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index 2bd878137..0ef222680 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -4751,7 +4751,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set # CONFIG_SOUND is not set CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SPARSE_RCU_POINTER=y # CONFIG_SPEAKUP is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 67cee3aeb..a280c1e3e 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -5214,7 +5214,6 @@ CONFIG_SONYPI_COMPAT=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SP5100_TCO=m CONFIG_SPARSE_IRQ=y CONFIG_SPARSEMEM_EXTREME=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 425e5b44c..85c55752f 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -5192,7 +5192,6 @@ CONFIG_SONYPI_COMPAT=y # CONFIG_SONYPI is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y -# CONFIG_SOUND_PRIME is not set CONFIG_SP5100_TCO=m CONFIG_SPARSE_IRQ=y CONFIG_SPARSEMEM_EXTREME=y