Merge http://linux-isdn.bkbits.net/linux-2.5.make

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

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

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