diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
tree | 954a648692e7da983db1d2470953705f6a729264 /drivers/sbus/char/Makefile | |
parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'drivers/sbus/char/Makefile')
-rw-r--r-- | drivers/sbus/char/Makefile | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile index ad8b7e140..b3a736db5 100644 --- a/drivers/sbus/char/Makefile +++ b/drivers/sbus/char/Makefile @@ -8,26 +8,18 @@ # O_TARGET := sunchar.o -O_OBJS := ${O_OBJ} sunkbd.o sunkbdmap.o sunmouse.o sunserial.o zs.o -vfc-objs := vfc_dev.o vfc_i2c.o +export-objs := su.o +obj-y := sunkbd.o sunkbdmap.o sunmouse.o sunserial.o zs.o -ifeq ($(CONFIG_PCI),y) -OX_OBJS += su.o -O_OBJS += pcikbd.o -endif +vfc-objs := vfc_dev.o vfc_i2c.o -ifeq ($(ARCH),sparc64) +obj-$(CONFIG_PCI) += su.o pcikbd.o -ifeq ($(CONFIG_PCI),y) obj-$(CONFIG_SAB82532) += sab82532.o obj-$(CONFIG_ENVCTRL) += envctrl.o obj-$(CONFIG_DISPLAY7SEG) += display7seg.o -endif - obj-$(CONFIG_OBP_FLASH) += flash.o -endif - obj-$(CONFIG_SUN_OPENPROMIO) += openprom.o obj-$(CONFIG_SUN_MOSTEK_RTC) += rtc.o obj-$(CONFIG_SUN_BPP) += bpp.o @@ -36,9 +28,6 @@ obj-$(CONFIG_SUN_AURORA) += aurora.o obj-$(CONFIG_TADPOLE_TS102_UCTRL) += uctrl.o obj-$(CONFIG_SUN_JSFLASH) += jsflash.o -O_OBJS += $(obj-y) -M_OBJS := $(obj-m) - include $(TOPDIR)/Rules.make sunkbdmap.o: sunkeymap.c |