diff options
author | Michael Neuling <mikey@neuling.org> | 2006-03-14 00:11:50 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-14 00:11:50 -0500 |
commit | e5c6c8e457d16c7cbc12f849ad18d4d508950de2 (patch) | |
tree | 25a6342ef5fa5ae19f1fbaed8538290225dba38d /arch/mips/Kconfig | |
parent | aaef685d5726768d25cbdc672a59c284d820b82e (diff) |
Input: pcspkr - separate device and driver registration
The current pcspkr code combines the device and driver registration.
This patch splits these, putting the device registration in the arch
specific code.
PowerPC and MIPS only have the pcspkr present sometimes.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 3a0f89d2c8dc..6d4333776d28 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -233,6 +233,7 @@ config MACH_JAZZ | |||
233 | select ARC32 | 233 | select ARC32 |
234 | select ARCH_MAY_HAVE_PC_FDC | 234 | select ARCH_MAY_HAVE_PC_FDC |
235 | select GENERIC_ISA_DMA | 235 | select GENERIC_ISA_DMA |
236 | select I8253 | ||
236 | select I8259 | 237 | select I8259 |
237 | select ISA | 238 | select ISA |
238 | select SYS_HAS_CPU_R4X00 | 239 | select SYS_HAS_CPU_R4X00 |
@@ -530,6 +531,7 @@ config QEMU | |||
530 | select DMA_COHERENT | 531 | select DMA_COHERENT |
531 | select GENERIC_ISA_DMA | 532 | select GENERIC_ISA_DMA |
532 | select HAVE_STD_PC_SERIAL_PORT | 533 | select HAVE_STD_PC_SERIAL_PORT |
534 | select I8253 | ||
533 | select I8259 | 535 | select I8259 |
534 | select ISA | 536 | select ISA |
535 | select SWAP_IO_SPACE | 537 | select SWAP_IO_SPACE |
@@ -714,6 +716,7 @@ config SNI_RM200_PCI | |||
714 | select HAVE_STD_PC_SERIAL_PORT | 716 | select HAVE_STD_PC_SERIAL_PORT |
715 | select HW_HAS_EISA | 717 | select HW_HAS_EISA |
716 | select HW_HAS_PCI | 718 | select HW_HAS_PCI |
719 | select I8253 | ||
717 | select I8259 | 720 | select I8259 |
718 | select ISA | 721 | select ISA |
719 | select SYS_HAS_CPU_R4X00 | 722 | select SYS_HAS_CPU_R4X00 |
@@ -1711,6 +1714,9 @@ config MMU | |||
1711 | bool | 1714 | bool |
1712 | default y | 1715 | default y |
1713 | 1716 | ||
1717 | config I8253 | ||
1718 | bool | ||
1719 | |||
1714 | source "drivers/pcmcia/Kconfig" | 1720 | source "drivers/pcmcia/Kconfig" |
1715 | 1721 | ||
1716 | source "drivers/pci/hotplug/Kconfig" | 1722 | source "drivers/pci/hotplug/Kconfig" |