summaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /drivers/sbus/char/Makefile
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'drivers/sbus/char/Makefile')
-rw-r--r--drivers/sbus/char/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile
index c516d98fd..9a4a59fe6 100644
--- a/drivers/sbus/char/Makefile
+++ b/drivers/sbus/char/Makefile
@@ -95,6 +95,14 @@ else
endif
endif
+ifeq ($(CONFIG_TADPOLE_TS102_UCTRL),y)
+O_OBJS += uctrl.o
+else
+ ifeq ($(CONFIG_TADPOLE_TS102_UCTRL),m)
+ M_OBJS += uctrl.o
+ endif
+endif
+
include $(TOPDIR)/Rules.make
sunkbdmap.o: sunkeymap.c