# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.889.359.8 -> 1.889.359.9
# drivers/pcmcia/Makefile 1.21 -> 1.22
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/03/24 hch@com.rmk.(none) 1.889.359.9
# [PCMCIA] drivers/pcmcia/Makefile tidyups
#
# (1) use the builtin foo-$(BAR) mechanism of the 2.5 kbuild
# (2) align all += foo.o statements
# --------------------------------------------
#
diff -Nru a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
--- a/drivers/pcmcia/Makefile Wed Mar 26 19:22:52 2003
+++ b/drivers/pcmcia/Makefile Wed Mar 26 19:22:52 2003
@@ -2,46 +2,43 @@
# Makefile for the kernel pcmcia subsystem (c/o David Hinds)
#
-obj-$(CONFIG_PCMCIA) += pcmcia_core.o ds.o
+obj-$(CONFIG_PCMCIA) += pcmcia_core.o ds.o
ifeq ($(CONFIG_CARDBUS),y)
- obj-$(CONFIG_PCMCIA) += yenta_socket.o
+ obj-$(CONFIG_PCMCIA) += yenta_socket.o
endif
-obj-$(CONFIG_I82365) += i82365.o
-obj-$(CONFIG_I82092) += i82092.o
-obj-$(CONFIG_TCIC) += tcic.o
-obj-$(CONFIG_HD64465_PCMCIA) += hd64465_ss.o
-obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o
-obj-$(CONFIG_PCMCIA_SA1111) += sa1111_cs.o
+obj-$(CONFIG_I82365) += i82365.o
+obj-$(CONFIG_I82092) += i82092.o
+obj-$(CONFIG_TCIC) += tcic.o
+obj-$(CONFIG_HD64465_PCMCIA) += hd64465_ss.o
+obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o
+obj-$(CONFIG_PCMCIA_SA1111) += sa1111_cs.o
-yenta_socket-objs := pci_socket.o yenta.o
+yenta_socket-y += 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-objs-y)
+pcmcia_core-y += cistpl.o rsrc_mgr.o bulkmem.o cs.o
+pcmcia_core-$(CONFIG_CARDBUS) += cardbus.o
-sa1111_cs-objs-y := sa1111_generic.o
-sa1111_cs-objs-$(CONFIG_SA1100_ADSBITSY) += sa1100_adsbitsy.o
-sa1111_cs-objs-$(CONFIG_ASSABET_NEPONSET) += sa1100_neponset.o
-sa1111_cs-objs-$(CONFIG_SA1100_BADGE4) += sa1100_badge4.o
-sa1111_cs-objs-$(CONFIG_SA1100_GRAPHICSMASTER) += sa1100_graphicsmaster.o
-sa1111_cs-objs-$(CONFIG_SA1100_JORNADA720) += sa1100_jornada720.o
-sa1111_cs-objs-$(CONFIG_SA1100_PFS168) += sa1100_pfs168.o
-sa1111_cs-objs-$(CONFIG_SA1100_PT_SYSTEM3) += sa1100_system3.o
-sa1111_cs-objs-$(CONFIG_SA1100_XP860) += sa1100_xp860.o
-sa1111_cs-objs := $(sa1111_cs-objs-y)
+sa1111_cs-y += sa1111_generic.o
+sa1111_cs-$(CONFIG_SA1100_ADSBITSY) += sa1100_adsbitsy.o
+sa1111_cs-$(CONFIG_ASSABET_NEPONSET) += sa1100_neponset.o
+sa1111_cs-$(CONFIG_SA1100_BADGE4) += sa1100_badge4.o
+sa1111_cs-$(CONFIG_SA1100_GRAPHICSMASTER) += sa1100_graphicsmaster.o
+sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1100_jornada720.o
+sa1111_cs-$(CONFIG_SA1100_PFS168) += sa1100_pfs168.o
+sa1111_cs-$(CONFIG_SA1100_PT_SYSTEM3) += sa1100_system3.o
+sa1111_cs-$(CONFIG_SA1100_XP860) += sa1100_xp860.o
-sa1100_cs-objs-y := sa1100_generic.o
-sa1100_cs-objs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o
-sa1100_cs-objs-$(CONFIG_SA1100_CERF) += sa1100_cerf.o
-sa1100_cs-objs-$(CONFIG_SA1100_FLEXANET) += sa1100_flexanet.o
-sa1100_cs-objs-$(CONFIG_SA1100_FREEBIRD) += sa1100_freebird.o
-sa1100_cs-objs-$(CONFIG_SA1100_GRAPHICSCLIENT) += sa1100_graphicsclient.o
-sa1100_cs-objs-$(CONFIG_SA1100_H3600) += sa1100_h3600.o
-sa1100_cs-objs-$(CONFIG_SA1100_PANGOLIN) += sa1100_pangolin.o
-sa1100_cs-objs-$(CONFIG_SA1100_SHANNON) += sa1100_shannon.o
-sa1100_cs-objs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o
-sa1100_cs-objs-$(CONFIG_SA1100_STORK) += sa1100_stork.o
-sa1100_cs-objs-$(CONFIG_SA1100_TRIZEPS) += sa1100_trizeps.o
-sa1100_cs-objs-$(CONFIG_SA1100_YOPY) += sa1100_yopy.o
-sa1100_cs-objs := $(sa1100_cs-objs-y)
+sa1100_cs-y += sa1100_generic.o
+sa1100_cs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o
+sa1100_cs-$(CONFIG_SA1100_CERF) += sa1100_cerf.o
+sa1100_cs-$(CONFIG_SA1100_FLEXANET) += sa1100_flexanet.o
+sa1100_cs-$(CONFIG_SA1100_FREEBIRD) += sa1100_freebird.o
+sa1100_cs-$(CONFIG_SA1100_GRAPHICSCLIENT) += sa1100_graphicsclient.o
+sa1100_cs-$(CONFIG_SA1100_H3600) += sa1100_h3600.o
+sa1100_cs-$(CONFIG_SA1100_PANGOLIN) += sa1100_pangolin.o
+sa1100_cs-$(CONFIG_SA1100_SHANNON) += sa1100_shannon.o
+sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o
+sa1100_cs-$(CONFIG_SA1100_STORK) += sa1100_stork.o
+sa1100_cs-$(CONFIG_SA1100_TRIZEPS) += sa1100_trizeps.o
+sa1100_cs-$(CONFIG_SA1100_YOPY) += sa1100_yopy.o
--
Russell King (rmk@arm.linux.org.uk) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Mar 31 2003 - 22:00:25 EST