diff options
| author | David Mosberger <davidm@napali.hpl.hp.com> | 2003-06-18 08:46:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2003-06-18 08:46:57 -0700 |
| commit | 77518190ed5af92fd55081d4db63251575ec92da (patch) | |
| tree | 18c819c11c213dc3a34973dee1670ca35e4c3b51 /drivers/serial | |
| parent | 8144c1577184d05afc1c5fc7c2135955dfdda0da (diff) | |
[PATCH] re-enable the building of 8250_hcdp and 8250_acpi
This adds a separate SERIAL_8250_ACPI config option and makes the
8250_acpi.c code dependent on ACPI_BUS (since acpi_bus_register_driver()
is a prerequisite).
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 17920b217f92..ab19af68c41b 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -77,7 +77,15 @@ config SERIAL_8250_CS a module, say M here and read <file:Documentation/modules.txt>. If unsure, say N. -config SERIAL_HCDP +config SERIAL_8250_ACPI + bool "8250/16550 device discovery via ACPI namespace" + default y if IA64 + depends on ACPI_BUS + ---help--- + If you wish to enable serial port discovery via the ACPI + namespace, say Y here. If unsure, say N. + +config SERIAL_8250_HCDP bool "8250/16550 device discovery support via EFI HCDP table" depends on IA64 ---help--- diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 64ae2473706f..13a7dc306853 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -8,7 +8,8 @@ serial-8250-y := serial-8250-$(CONFIG_GSC) += 8250_gsc.o serial-8250-$(CONFIG_PCI) += 8250_pci.o serial-8250-$(CONFIG_PNP) += 8250_pnp.o -serial-8250-$(CONFIG_SERIAL_HCDP) += 8250_hcdp.o +serial-8250-$(CONFIG_SERIAL_8250_HCDP) += 8250_hcdp.o +serial-8250-$(CONFIG_SERIAL_8250_ACPI) += 8250_acpi.o obj-$(CONFIG_SERIAL_CORE) += core.o obj-$(CONFIG_SERIAL_21285) += 21285.o |