From abc22fda2609619c3d7106cc2d9ca806e57bd512 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 1 Jun 2011 19:05:10 +0100 Subject: [PATCH] --- yaml --- r: 257193 b: refs/heads/master c: 8a118c3872945d54e0cacdea06c93527cdfb8782 h: refs/heads/master i: 257191: 8496752ed68682049cb346d9052745eee8b3ffa0 v: v3 --- [refs] | 2 +- trunk/arch/mips/Kconfig | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 15f8b85bf595..710093e5831f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8761f1ab717cac0616f8cf7ec589ae021c739113 +refs/heads/master: 8a118c3872945d54e0cacdea06c93527cdfb8782 diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index bf35bb6b3bc1..45f7aacc0278 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/arch/mips/Kconfig @@ -5,7 +5,6 @@ config MIPS select HAVE_IDE select HAVE_OPROFILE select HAVE_IRQ_WORK - select HAVE_PCSPKR_PLATFORM select HAVE_PERF_EVENTS select PERF_USE_VMALLOC select HAVE_ARCH_KGDB @@ -186,6 +185,7 @@ config MACH_JAZZ select CSRC_R4K select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN select GENERIC_ISA_DMA + select HAVE_PCSPKR_PLATFORM select IRQ_CPU select I8253 select I8259 @@ -267,6 +267,7 @@ config MIPS_MALTA select CSRC_R4K select DMA_NONCOHERENT select GENERIC_ISA_DMA + select HAVE_PCSPKR_PLATFORM select IRQ_CPU select IRQ_GIC select HW_HAS_PCI @@ -641,6 +642,7 @@ config SNI_RM select DEFAULT_SGI_PARTITION if CPU_BIG_ENDIAN select DMA_NONCOHERENT select GENERIC_ISA_DMA + select HAVE_PCSPKR_PLATFORM select HW_HAS_EISA select HW_HAS_PCI select IRQ_CPU