---

yaml --- r: 24019 b: refs/heads/master c: 111c9bf h: refs/heads/master i: 24017: e3a42ee 24015: ac1c602 v: v3
git-mirror · Mar 25, 2006 · 0d664c0 · 0d664c0
1 parent 66185e4
commit 0d664c0
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 193 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb2fc532d0a304631c92b175f886934654c60907
+refs/heads/master: 111c9bf8c5cfa92363b3719c8956d29368b5b9de
diff --git a/trunk/drivers/serial/8250_acpi.c b/trunk/drivers/serial/8250_acpi.c
diff --git a/trunk/drivers/serial/Kconfig b/trunk/drivers/serial/Kconfig
@@ -77,14 +77,6 @@ config SERIAL_8250_CS
 
 	  If unsure, say N.
 
-config SERIAL_8250_ACPI
-	bool "8250/16550 device discovery via ACPI namespace"
-	default y if IA64
-	depends on ACPI && SERIAL_8250
-	---help---
-	  If you wish to enable serial port discovery via the ACPI
-	  namespace, say Y here.  If unsure, say N.
-
 config SERIAL_8250_NR_UARTS
 	int "Maximum number of 8250/16550 serial ports"
 	depends on SERIAL_8250

diff --git a/trunk/drivers/serial/Makefile b/trunk/drivers/serial/Makefile
@@ -5,7 +5,6 @@
 #
 
 serial-8250-y :=
-serial-8250-$(CONFIG_SERIAL_8250_ACPI) += 8250_acpi.o
 serial-8250-$(CONFIG_PNP) += 8250_pnp.o
 serial-8250-$(CONFIG_GSC) += 8250_gsc.o
 serial-8250-$(CONFIG_PCI) += 8250_pci.o