Merge master.kernel.org:/home/rmk/linux-2.6-serial

* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] Allow 8250 PCI, PNP, GSC and HP300 support to be disabled

+32 -7
+27
drivers/serial/Kconfig
··· 63 64 If unsure, say N. 65 66 config SERIAL_8250_CS 67 tristate "8250/16550 PCMCIA device support" 68 depends on PCMCIA && SERIAL_8250
··· 63 64 If unsure, say N. 65 66 + config SERIAL_8250_GSC 67 + tristate 68 + depends on SERIAL_8250 && GSC 69 + default SERIAL_8250 70 + 71 + config SERIAL_8250_PCI 72 + tristate "8250/16550 PCI device support" if EMBEDDED 73 + depends on SERIAL_8250 && PCI 74 + default SERIAL_8250 75 + help 76 + This builds standard PCI serial support. You may be able to 77 + disable this feature if you only need legacy serial support. 78 + Saves about 9K. 79 + 80 + config SERIAL_8250_PNP 81 + tristate "8250/16550 PNP device support" if EMBEDDED 82 + depends on SERIAL_8250 && PNP 83 + default SERIAL_8250 84 + help 85 + This builds standard PNP serial support. You may be able to 86 + disable this feature if you only need legacy serial support. 87 + 88 + config SERIAL_8250_HP300 89 + tristate 90 + depends on SERIAL_8250 && HP300 91 + default SERIAL_8250 92 + 93 config SERIAL_8250_CS 94 tristate "8250/16550 PCMCIA device support" 95 depends on PCMCIA && SERIAL_8250
+5 -7
drivers/serial/Makefile
··· 4 # $Id: Makefile,v 1.8 2002/07/21 21:32:30 rmk Exp $ 5 # 6 7 - serial-8250-y := 8 - serial-8250-$(CONFIG_PNP) += 8250_pnp.o 9 - serial-8250-$(CONFIG_GSC) += 8250_gsc.o 10 - serial-8250-$(CONFIG_PCI) += 8250_pci.o 11 - serial-8250-$(CONFIG_HP300) += 8250_hp300.o 12 - 13 obj-$(CONFIG_SERIAL_CORE) += serial_core.o 14 obj-$(CONFIG_SERIAL_21285) += 21285.o 15 - obj-$(CONFIG_SERIAL_8250) += 8250.o $(serial-8250-y) 16 obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o 17 obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o 18 obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o
··· 4 # $Id: Makefile,v 1.8 2002/07/21 21:32:30 rmk Exp $ 5 # 6 7 obj-$(CONFIG_SERIAL_CORE) += serial_core.o 8 obj-$(CONFIG_SERIAL_21285) += 21285.o 9 + obj-$(CONFIG_SERIAL_8250) += 8250.o 10 + obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o 11 + obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o 12 + obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o 13 + obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o 14 obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o 15 obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o 16 obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o