patch-2.4.0-test9 linux/drivers/acorn/char/Makefile

Next file: linux/drivers/acorn/char/defkeymap-acorn.c
Previous file: linux/drivers/acorn/block/mfmhd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/acorn/char/Makefile linux/drivers/acorn/char/Makefile
@@ -28,19 +28,15 @@
 
 obj-arc		:= keyb_arc.o
 obj-rpc		:= keyb_ps2.o
+obj-clps7500	:= keyb_ps2.o defkeymap-acorn.o
 
 obj-$(CONFIG_RPCMOUSE)		+= mouse_rpc.o
 obj-$(CONFIG_ATOMWIDE_SERIAL)	+= serial-atomwide.o
 obj-$(CONFIG_DUALSP_SERIAL)	+= serial-dualsp.o
-obj-$(CONFIG_ARCH_ACORN)	+= defkeymap-acorn.o
+obj-$(CONFIG_ARCH_ACORN)	+= defkeymap-acorn.o i2c.o pcf8583.o
 
 # Do the i2c and rtc last
 obj-y		+= $(obj-$(MACHINE)) 
-
-# CL-PS7500 does not have these devices.
-ifneq ($(CONFIG_ARCH_CLPS7500),y)
-obj-y += i2c.o pcf8583.o
-endif
 
 O_OBJS		:= $(filter-out $(export-objs), $(obj-y))
 OX_OBJS		:= $(filter     $(export-objs), $(obj-y))

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)