Commit de61b542 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Rename PC speaker code 



While the PC speaker is wired up to the i8254 there is more to the i8254
than just the PC speaker so this code was getting in the way under its
current name.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent fdc1f938

arch/mips/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -117,9 +117,9 @@ config MACH_JAZZ 
	select ARC32

	select ARCH_MAY_HAVE_PC_FDC

	select GENERIC_ISA_DMA

	select I8253

	select I8259

	select ISA

	select PCSPEAKER

	select SYS_HAS_CPU_R4X00

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
@@ -347,9 +347,9 @@ config QEMU 
	select DMA_COHERENT

	select GENERIC_ISA_DMA

	select HAVE_STD_PC_SERIAL_PORT

	select I8253

	select I8259

	select ISA

	select PCSPEAKER

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL
@@ -562,9 +562,9 @@ config SNI_RM 
	select HW_HAS_EISA

	select HW_HAS_PCI

	select IRQ_CPU

	select I8253

	select I8259

	select ISA

	select PCSPEAKER

	select SWAP_IO_SPACE if CPU_BIG_ENDIAN

	select SYS_HAS_CPU_R4X00

	select SYS_HAS_CPU_R5000
@@ -1864,7 +1864,7 @@ config MMU 
	bool

	default y



config I8253

config PCSPEAKER

	bool



source "drivers/pcmcia/Kconfig"

arch/mips/configs/jazz_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
#

CONFIG_ISA=y

CONFIG_MMU=y

CONFIG_I8253=y

CONFIG_PCSPEAKER=y



#

# PCCARD (PCMCIA/CardBus) support

arch/mips/configs/qemu_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ CONFIG_DEFAULT_IOSCHED="noop" 
#

CONFIG_ISA=y

CONFIG_MMU=y

CONFIG_I8253=y

CONFIG_PCSPEAKER=y



#

# PCCARD (PCMCIA/CardBus) support

arch/mips/configs/rm200_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ CONFIG_PCI=y 
CONFIG_ISA=y

# CONFIG_EISA is not set

CONFIG_MMU=y

CONFIG_I8253=y

CONFIG_PCSPEAKER=y



#

# PCCARD (PCMCIA/CardBus) support

arch/mips/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ obj-$(CONFIG_PROC_FS) += proc.o 


obj-$(CONFIG_64BIT)		+= cpu-bugs64.o



obj-$(CONFIG_I8253)		+= i8253.o

obj-$(CONFIG_PCSPEAKER)		+= pcspeaker.o



obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o

obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o