diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
| commit | f3627cbe9236a062012c836f3b6ee311b43f63f2 (patch) | |
| tree | ae854838b9a73b35bd0f3b8f42e5fb7f9cb1d5a9 /drivers/char/Makefile | |
| parent | fea12a7b3f20bc135ab533491411e9ff753c01c8 (diff) | |
Merge with Linux 2.4.0-test5-pre4.
Diffstat (limited to 'drivers/char/Makefile')
| -rw-r--r-- | drivers/char/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 9bba10cf4..085c48c8f 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -76,19 +76,11 @@ ifeq ($(ARCH),sh) KEYMAP = KEYBD = CONSOLE = - SERIAL = ifeq ($(CONFIG_SH_HP600),y) KEYMAP = defkeymap.o KEYBD = scan_keyb.o hp600_keyb.o CONSOLE = console.o endif - ifeq ($(CONFIG_SERIAL),y) - SERIAL = generic_serial.o sh-sci.o - else - ifeq ($(CONFIG_SERIAL),m) - SERIAL = sh-sci.o - endif - endif endif ifeq ($(CONFIG_DECSTATION),y) @@ -149,7 +141,7 @@ obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o # So this should simply provide the wanted functionality! obj-$(CONFIG_SX) += sx.o generic_serial.o obj-$(CONFIG_RIO) += rio/rio.o generic_serial.o - +obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o ifeq ($(CONFIG_RIO),y) SUB_DIRS += rio |