diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-05-08 01:09:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-05-08 01:09:08 -0700 |
| commit | 14231ee7e7c683c703c77c0ea7a71b674bb2b467 (patch) | |
| tree | 7e53026e5d84bb27c03fa23297f1334e860f5658 | |
| parent | 8a293280cb9fc8a1025e24b99a639935ee4e9fc1 (diff) | |
| parent | 7c0946555d277a876b7af26e33aedb44e4ed0adf (diff) | |
Merge http://linux-isdn.bkbits.net/linux-2.5.make
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
| -rw-r--r-- | drivers/pcmcia/Makefile | 2 | ||||
| -rw-r--r-- | fs/jffs/Makefile | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index d8acd32dbefd..804b323235d2 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -21,7 +21,7 @@ yenta_socket-objs := pci_socket.o yenta.o pcmcia_core-objs-y := cistpl.o rsrc_mgr.o bulkmem.o cs.o pcmcia_core-objs-$(CONFIG_CARDBUS) += cardbus.o -pcmcia_core-objs := $(pcmcia_core-y) +pcmcia_core-objs := $(pcmcia_core-objs-y) sa1100_cs-objs-y := sa1100_generic.o sa1100_cs-objs-$(CONFIG_SA1100_ADSBITSY) += sa1100_adsbitsy.o sa1111_generic.o diff --git a/fs/jffs/Makefile b/fs/jffs/Makefile index 878887381d8c..4ad5e8f5e400 100644 --- a/fs/jffs/Makefile +++ b/fs/jffs/Makefile @@ -4,21 +4,20 @@ # $Id: Makefile,v 1.11 2001/09/25 20:59:41 dwmw2 Exp $ # -jffs-objs := jffs_fm.o intrep.o +obj-y := jffs_fm.o intrep.o ifeq ($(PATCHLEVEL),2) - jffs-objs += inode-v22.o + obj-y += inode-v22.o else - jffs-objs += inode-v23.o + obj-y += inode-v23.o endif ifeq ($(CONFIG_JFFS_PROC_FS),y) - jffs-objs += jffs_proc.o + obj-y += jffs_proc.o endif O_TARGET := jffs.o -obj-y := $(jffs-objs) obj-m := $(O_TARGET) include $(TOPDIR)/Rules.make |