Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv16976/drivers/char
Modified Files:
Makefile
Log Message:
Merge with 2.5.31
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile 9 Feb 2003 21:34:06 -0000 1.18
+++ Makefile 10 Feb 2003 02:23:43 -0000 1.19
@@ -65,6 +65,12 @@
endif
endif
+ifeq ($(ARCH),um)
+ KEYMAP =
+ KEYBD =
+ CONSOLE =
+endif
+
ifeq ($(ARCH),sh)
KEYMAP =
KEYBD =
@@ -108,14 +114,18 @@
KEYMAP = qtronixmap.o
endif
+ifeq ($(CONFIG_SPARC32),y)
+ KEYBD =
+endif
+
+ifeq ($(CONFIG_SPARC64),y)
+ KEYBD =
+endif
+
obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o
#obj-$(CONFIG_SERIAL) += $(SERIAL) # Fix for decserial.o
-ifndef CONFIG_SUN_KEYBOARD
- obj-$(CONFIG_VT) += keyboard.o $(KEYMAP) $(KEYBD)
-else
- obj-$(CONFIG_PCI) += keyboard.o $(KEYMAP)
-endif
+obj-$(CONFIG_VT) += keyboard.o $(KEYMAP) $(KEYBD)
obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
|
