diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
commit | c5fbc3966f48279dbebfde10248c977014aa9988 (patch) | |
tree | 0a52f645d89f91952c26b215f460a4ba195ca42c /drivers/serial/Makefile | |
parent | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff) | |
parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 65bd4381685e..11c7dc483f93 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile | |||
@@ -44,7 +44,6 @@ obj-$(CONFIG_SERIAL_LH7A40X) += serial_lh7a40x.o | |||
44 | obj-$(CONFIG_SERIAL_AU1X00) += au1x00_uart.o | 44 | obj-$(CONFIG_SERIAL_AU1X00) += au1x00_uart.o |
45 | obj-$(CONFIG_SERIAL_DZ) += dz.o | 45 | obj-$(CONFIG_SERIAL_DZ) += dz.o |
46 | obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o | 46 | obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o |
47 | obj-$(CONFIG_SERIAL_BAST_SIO) += bast_sio.o | ||
48 | obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o | 47 | obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o |
49 | obj-$(CONFIG_SERIAL_CPM) += cpm_uart/ | 48 | obj-$(CONFIG_SERIAL_CPM) += cpm_uart/ |
50 | obj-$(CONFIG_SERIAL_IMX) += imx.o | 49 | obj-$(CONFIG_SERIAL_IMX) += imx.o |