diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 23:31:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 23:31:32 -0500 |
| commit | 36ddf5bbdea7ba4582abc62f106f0f0e9f0b6b91 (patch) | |
| tree | 163d637dfda12eba3f8822d3b2941869b2d0ba00 /drivers/serial/Makefile | |
| parent | a41622eaa97e40c811fb7756f403c0d4caa65654 (diff) | |
| parent | 104c7b03ea0913a24be103db66d8cf1f1f99a49a (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[ARM] 3383/3: ixp2000: ixdp2x01 platform serial conversion
[SERIAL] amba-pl010: Remove accessor macros
[SERIAL] remove 8250_acpi (replaced by 8250_pnp and PNPACPI)
[SERIAL] icom: select FW_LOADER
Diffstat (limited to 'drivers/serial/Makefile')
| -rw-r--r-- | drivers/serial/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 50c221af9e6d..a3a4323d9c86 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | serial-8250-y := | 7 | serial-8250-y := |
| 8 | serial-8250-$(CONFIG_SERIAL_8250_ACPI) += 8250_acpi.o | ||
| 9 | serial-8250-$(CONFIG_PNP) += 8250_pnp.o | 8 | serial-8250-$(CONFIG_PNP) += 8250_pnp.o |
| 10 | serial-8250-$(CONFIG_GSC) += 8250_gsc.o | 9 | serial-8250-$(CONFIG_GSC) += 8250_gsc.o |
| 11 | serial-8250-$(CONFIG_PCI) += 8250_pci.o | 10 | serial-8250-$(CONFIG_PCI) += 8250_pci.o |