diff options
| author | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-05-28 13:46:26 -0500 |
|---|---|---|
| committer | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-05-28 13:46:26 -0500 |
| commit | 2ce8d4213a0fdbfae6aefa5f69bd5787a97844eb (patch) | |
| tree | 7c306206f7652634289601092ff950431d685972 /drivers | |
| parent | 4fd5bb5d17e440cf34a3b3bb2973f16a76d5eb38 (diff) | |
| parent | 1c7ddd8848a9f5f947d0d3ebd4be5676739f5cd9 (diff) | |
Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-ok
into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-drivers
Diffstat (limited to 'drivers')
61 files changed, 107 insertions, 375 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 0591faa60339..257042170946 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -9,43 +9,43 @@ mod-subdirs := dio mtd sbus video macintosh usb input telephony sgi ide \ message scsi md ieee1394 pnp isdn atm \ fc4 i2c acpi bluetooth input/serio \ - input/gameport parport hotplug + input/gameport parport hotplug \ + base char block misc net media cdrom -subdir-y := base char block net misc media cdrom -subdir-m := $(subdir-y) - -subdir-$(CONFIG_PARPORT) += parport -subdir-$(CONFIG_HOTPLUG_PCI) += hotplug -subdir-$(CONFIG_DIO) += dio -subdir-$(CONFIG_PCI) += pci -subdir-$(CONFIG_PCMCIA) += pcmcia -subdir-$(CONFIG_MTD) += mtd -subdir-$(CONFIG_SBUS) += sbus -subdir-$(CONFIG_ZORRO) += zorro -subdir-$(CONFIG_NUBUS) += nubus -subdir-$(CONFIG_TC) += tc -subdir-$(CONFIG_VT) += video -subdir-$(CONFIG_MAC) += macintosh -subdir-$(CONFIG_ALL_PPC) += macintosh -subdir-$(CONFIG_USB) += usb -subdir-$(CONFIG_INPUT) += input -subdir-$(CONFIG_SERIO) += input/serio -subdir-$(CONFIG_GAMEPORT) += input/gameport -subdir-$(CONFIG_PHONE) += telephony -subdir-$(CONFIG_SGI) += sgi -subdir-$(CONFIG_IDE) += ide -subdir-$(CONFIG_SCSI) += scsi -subdir-$(CONFIG_I2O) += message -subdir-$(CONFIG_FUSION) += message -subdir-$(CONFIG_MD) += md -subdir-$(CONFIG_IEEE1394) += ieee1394 -subdir-$(CONFIG_PNP) += pnp -subdir-$(CONFIG_ISDN) += isdn -subdir-$(CONFIG_ATM) += atm -subdir-$(CONFIG_FC4) += fc4 -subdir-$(CONFIG_I2C) += i2c -subdir-$(CONFIG_ACPI) += acpi - -subdir-$(CONFIG_BLUEZ) += bluetooth +obj-$(CONFIG_ACPI) += acpi/ +obj-$(CONFIG_PCI) += pci/ +obj-$(CONFIG_PARPORT) += parport/ +obj-y += base/ char/ block/ misc/ net/ media/ +obj-$(CONFIG_NUBUS) += nubus/ +obj-$(CONFIG_ATM) += atm/ +obj-$(CONFIG_IDE) += ide/ +obj-$(CONFIG_FC4) += fc4/ +obj-$(CONFIG_SCSI) += scsi/ +obj-$(CONFIG_FUSION) += message/ +obj-$(CONFIG_IEEE1394) += ieee1394/ +obj-y += cdrom/ +obj-$(CONFIG_MTD) += mtd/ +obj-$(CONFIG_PCMCIA) += pcmcia/ +obj-$(CONFIG_DIO) += dio/ +obj-$(CONFIG_SBUS) += sbus/ +obj-$(CONFIG_ZORRO) += zorro/ +obj-$(CONFIG_ALL_PPC) += macintosh/ +obj-$(CONFIG_MAC) += macintosh/ +obj-$(CONFIG_PNP) += pnp/ +obj-$(CONFIG_SGI) += sgi/ +obj-$(CONFIG_VT) += video/ +obj-$(CONFIG_PARIDE) += block/paride/ +obj-$(CONFIG_TC) += tc/ +obj-$(CONFIG_USB) += usb/ +obj-$(CONFIG_INPUT) += input/ +obj-$(CONFIG_GAMEPORT) += input/gameport/ +obj-$(CONFIG_SERIO) += input/serio/ +obj-$(CONFIG_I2O) += message/ +obj-$(CONFIG_I2C) += i2c/ +obj-$(CONFIG_PHONE) += telephony/ +obj-$(CONFIG_MD) += md/ +obj-$(CONFIG_BLUEZ) += bluetooth/ +obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ +obj-$(CONFIG_ISDN) += isdn/ include $(TOPDIR)/Rules.make diff --git a/drivers/acorn/Makefile b/drivers/acorn/Makefile deleted file mode 100644 index 491e83fa3479..000000000000 --- a/drivers/acorn/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# -# Makefile for the Acorn-specific Linux kernel device drivers. -# -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (not a .c file). - -subdir-y := char -subdir-m := $(subdir-y) - -# the BLOCK subdir is included from drivers/block now -# the SCSI subdir is included from drivers/scsi now -# the NET subdir is included from drivers/net now - -include $(TOPDIR)/Rules.make diff --git a/drivers/acorn/block/Makefile b/drivers/acorn/block/Makefile index 7a77c26fbcfa..aadc45fac126 100644 --- a/drivers/acorn/block/Makefile +++ b/drivers/acorn/block/Makefile @@ -2,14 +2,6 @@ # Makefile for the Acorn block device drivers. # -O_TARGET := acorn-block.o - -obj-y := -obj-m := -obj-n := -obj- := - -export-objs := fd1772_mod-objs := fd1772.o fd1772dma.o mfmhd_mod-objs := mfmhd.o mfm.o diff --git a/drivers/acorn/char/Makefile b/drivers/acorn/char/Makefile index 76840563eb64..f5ad3bc58e0f 100644 --- a/drivers/acorn/char/Makefile +++ b/drivers/acorn/char/Makefile @@ -1,22 +1,6 @@ # -# Makefile for the kernel character device drivers. +# Makefile for the acorn character device drivers. # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -# Note 2! The CFLAGS definitions are now inherited from the -# parent makes.. -# - -O_TARGET := acorn-char.o - -# Object file lists. - -obj-y := -obj-m := -obj-n := -obj- := # All the objects that export symbols. export-objs := mouse_rpc.o diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 2c0d318cce2c..390917e8e087 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -2,8 +2,6 @@ # Makefile for the Linux ACPI interpreter # -O_TARGET := acpi.o - export ACPI_CFLAGS ACPI_CFLAGS := -D_LINUX -I$(CURDIR)/include diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile index 053df01e7242..5549b60193e2 100644 --- a/drivers/atm/Makefile +++ b/drivers/atm/Makefile @@ -2,8 +2,6 @@ # Makefile for the Linux network (ATM) device drivers. # -O_TARGET := atm.o - export-objs := uPD98402.o suni.o idt77105.o obj-y := atmdev_init.o diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 3ff40bf56fc6..94756ce763e0 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile @@ -1,4 +1,4 @@ -O_TARGET := base.o +# Makefile for the Linux device tree obj-y := core.o sys.o interface.o fs.o power.o diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 87d951cc28a1..88eb4e457644 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -8,8 +8,6 @@ # In the future, some of these should be built conditionally. # -O_TARGET := block.o - export-objs := elevator.o ll_rw_blk.o blkpg.o loop.o DAC960.o genhd.o block_ioctl.o obj-y := elevator.o ll_rw_blk.o blkpg.o genhd.o block_ioctl.o @@ -33,6 +31,4 @@ obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o obj-$(CONFIG_BLK_DEV_UMEM) += umem.o obj-$(CONFIG_BLK_DEV_NBD) += nbd.o -subdir-$(CONFIG_PARIDE) += paride - include $(TOPDIR)/Rules.make diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile index db1e9ec2770b..ada41c6689a4 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile @@ -2,21 +2,14 @@ # Makefile for Bluetooth HCI device drivers. # -O_TARGET := bluetooth.o - -list-multi := hci_uart.o - obj-$(CONFIG_BLUEZ_HCIUSB) += hci_usb.o obj-$(CONFIG_BLUEZ_HCIVHCI) += hci_vhci.o - obj-$(CONFIG_BLUEZ_HCIUART) += hci_uart.o -uart-y := hci_ldisc.o -uart-$(CONFIG_BLUEZ_HCIUART_H4) += hci_h4.o - obj-$(CONFIG_BLUEZ_HCIDTL1) += dtl1_cs.o obj-$(CONFIG_BLUEZ_HCIBLUECARD) += bluecard_cs.o -include $(TOPDIR)/Rules.make +hci_uart-y := hci_ldisc.o +hci_uart-$(CONFIG_BLUEZ_HCIUART_H4) += hci_h4.o +hci_uart-objs := $(hci_uart-y) -hci_uart.o: $(uart-y) - $(LD) -r -o $@ $(uart-y) +include $(TOPDIR)/Rules.make diff --git a/drivers/cdrom/Makefile b/drivers/cdrom/Makefile index 21f402d49ef0..f7def1b920e9 100644 --- a/drivers/cdrom/Makefile +++ b/drivers/cdrom/Makefile @@ -3,9 +3,6 @@ # 30 Jan 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net> # Rewritten to use lists instead of if-statements. -O_TARGET := driver.o - - # All of the (potential) objects that export symbols. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 2789d71fc9e5..c8e5ad622e56 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -7,8 +7,6 @@ # FONTMAPFILE = cp437.uni -O_TARGET := char.o - obj-y += mem.o tty_io.o n_tty.o tty_ioctl.o raw.o pty.o misc.o random.o # All of the (potential) objects that export symbols. diff --git a/drivers/hotplug/Makefile b/drivers/hotplug/Makefile index eff79bdfd691..36ab600d125c 100644 --- a/drivers/hotplug/Makefile +++ b/drivers/hotplug/Makefile @@ -2,8 +2,6 @@ # Makefile for the Linux kernel pci hotplug controller drivers. # -O_TARGET := vmlinux-obj.o - export-objs := pci_hotplug_core.o pci_hotplug_util.o obj-$(CONFIG_HOTPLUG_PCI) += pci_hotplug.o diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 5bd254afd23e..17545927964b 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -2,8 +2,6 @@ # Makefile for the kernel i2c bus driver. # -O_TARGET := i2c.o - export-objs := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \ i2c-algo-ite.o i2c-proc.o diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile index d1dfe379ade3..97e13db60c84 100644 --- a/drivers/ide/Makefile +++ b/drivers/ide/Makefile @@ -8,15 +8,9 @@ # In the future, some of these should be built conditionally. # -O_TARGET := idedriver.o - export-objs := ide-taskfile.o main.o ide.o ide-features.o ide-probe.o quirks.o pcidma.o tcq.o \ atapi.o ataraid.o -obj-y := -obj-m := -ide-obj-y := - obj-$(CONFIG_BLK_DEV_HD) += hd.o obj-$(CONFIG_BLK_DEV_IDE) += ide-mod.o obj-$(CONFIG_BLK_DEV_IDECS) += ide-cs.o diff --git a/drivers/ieee1394/Makefile b/drivers/ieee1394/Makefile index b80c81a2d6d8..59d51d5e518e 100644 --- a/drivers/ieee1394/Makefile +++ b/drivers/ieee1394/Makefile @@ -2,8 +2,6 @@ # Makefile for the Linux IEEE 1394 implementation # -O_TARGET := ieee1394drv.o - export-objs := ieee1394_core.o ohci1394.o cmp.o ieee1394-objs := ieee1394_core.o ieee1394_transactions.o hosts.o \ diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 688cca9800d3..90e158f6bd55 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -2,10 +2,6 @@ # Makefile for the input core drivers. # -# The target object and module list name. - -O_TARGET := inputdrv.o - # Objects that export symbols. mod-subdirs := joystick diff --git a/drivers/input/gameport/Makefile b/drivers/input/gameport/Makefile index a15bcbbef2bb..60509253a031 100644 --- a/drivers/input/gameport/Makefile +++ b/drivers/input/gameport/Makefile @@ -2,10 +2,6 @@ # Makefile for the gameport drivers. # -# The target object and module list name. - -O_TARGET := gamedrv.o - # Objects that export symbols. export-objs := gameport.o diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile index 9287af0baf71..5865d9be9059 100644 --- a/drivers/input/serio/Makefile +++ b/drivers/input/serio/Makefile @@ -2,10 +2,6 @@ # Makefile for the input core drivers. # -# The target object and module list name. - -O_TARGET := seriodrv.o - # Objects that export symbols. export-objs := serio.o diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile index ef3362723579..b36f539adaca 100644 --- a/drivers/isdn/Makefile +++ b/drivers/isdn/Makefile @@ -1,9 +1,5 @@ # Makefile for the kernel ISDN subsystem and device drivers. -# The target object and module list name. - -O_TARGET := vmlinux-obj.o - # Object files in subdirectories mod-subdirs := i4l hisax capi eicon diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile index 64287cc819a6..81e5c57c3a10 100644 --- a/drivers/macintosh/Makefile +++ b/drivers/macintosh/Makefile @@ -1,17 +1,6 @@ # # Makefile for the Macintosh-specific device drivers. # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -# Note 2! The CFLAGS definitions are now inherited from the -# parent makes.. -# - -# The target object and module list name. - -O_TARGET := macintosh.o # Objects that export symbols. diff --git a/drivers/md/Makefile b/drivers/md/Makefile index 61e60fa44735..31c60da45261 100644 --- a/drivers/md/Makefile +++ b/drivers/md/Makefile @@ -2,8 +2,6 @@ # Makefile for the kernel software RAID and LVM drivers. # -O_TARGET := mddev.o - export-objs := md.o xor.o lvm-mod-objs := lvm.o lvm-snap.o lvm-fs.o diff --git a/drivers/media/Makefile b/drivers/media/Makefile index 4f89d208ad37..60ef7cb4c5ba 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile @@ -1,18 +1,9 @@ # # Makefile for the kernel multimedia device drivers. # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -# Note 2! The CFLAGS definitions are now inherited from the -# parent makes.. -# -subdir-y := video radio mod-subdirs := video radio -O_TARGET := media.o -obj-y := $(join $(subdir-y),$(subdir-y:%=/%.o)) +obj-y := video/ radio/ include $(TOPDIR)/Rules.make diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile index f691d13ac565..81b646f0ef53 100644 --- a/drivers/media/radio/Makefile +++ b/drivers/media/radio/Makefile @@ -2,15 +2,6 @@ # Makefile for the kernel character device drivers. # -# Object file lists. - -obj-y := -obj-m := -obj-n := -obj- := - -O_TARGET := radio.o - # All of the (potential) objects that export symbols. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 50c24aa1d0ac..af6fb58f3a4e 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -2,15 +2,6 @@ # Makefile for the kernel character device drivers. # -# Object file lists. - -obj-y := -obj-m := -obj-n := -obj- := - -O_TARGET := video.o - # All of the (potential) objects that export symbols. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. diff --git a/drivers/message/Makefile b/drivers/message/Makefile index 74d1b201f052..743f5d1acab4 100644 --- a/drivers/message/Makefile +++ b/drivers/message/Makefile @@ -2,8 +2,6 @@ # Makefile for MPT based block devices # -O_TARGET := message.o - mod-subdirs := i2o fusion obj-$(CONFIG_I2O) += i2o/ diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index b77e846ef0aa..dc7ec8baee12 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -1,16 +1,5 @@ # # Makefile for misc devices that really don't fit anywhere else. # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -# Note 2! The CFLAGS definitions are now inherited from the -# parent makes.. -# - -O_TARGET := misc.o include $(TOPDIR)/Rules.make - -fastdep: diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index fb2a81aafddd..38903a1c4712 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -5,19 +5,11 @@ # $Id: Makefile,v 1.63 2001/06/13 09:43:07 dwmw2 Exp $ -obj-y += chips/chipslink.o maps/mapslink.o \ - devices/devlink.o nand/nandlink.o -obj-m := -obj-n := -obj- := - -O_TARGET := mtdlink.o +mod-subdirs := chips maps devices nand export-objs := mtdcore.o mtdpart.o redboot.o bootldr.o afs.o -mod-subdirs := -subdir-y := chips maps devices nand -subdir-m := $(subdir-y) +obj-y += chips/ maps/ devices/ nand/ # *** BIG UGLY NOTE *** # diff --git a/drivers/mtd/chips/Makefile b/drivers/mtd/chips/Makefile index aea67983468e..ed074639f968 100644 --- a/drivers/mtd/chips/Makefile +++ b/drivers/mtd/chips/Makefile @@ -3,8 +3,6 @@ # # $Id: Makefile,v 1.7 2001/10/05 06:53:51 dwmw2 Exp $ -O_TARGET := chipslink.o - export-objs := chipreg.o gen_probe.o # *** BIG UGLY NOTE *** diff --git a/drivers/mtd/devices/Makefile b/drivers/mtd/devices/Makefile index 8b66545d3d97..693666b9ae07 100644 --- a/drivers/mtd/devices/Makefile +++ b/drivers/mtd/devices/Makefile @@ -3,8 +3,6 @@ # # $Id: Makefile,v 1.4 2001/06/26 21:10:05 spse Exp $ -O_TARGET := devlink.o - # *** BIG UGLY NOTE *** # # The removal of get_module_symbol() and replacement with diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index d88d9bd1dcc0..d6cd7af1b203 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile @@ -3,8 +3,6 @@ # # $Id: Makefile,v 1.13 2001/08/16 15:16:58 rmk Exp $ -O_TARGET := mapslink.o - # Chip mappings obj-$(CONFIG_MTD_CDB89712) += cdb89712.o obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 87de0136efe0..fe95a2c5a745 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -3,8 +3,6 @@ # # $Id: Makefile,v 1.5 2001/09/19 22:39:59 dwmw2 Exp $ -O_TARGET := nandlink.o - export-objs := nand.o nand_ecc.o nandobjs-y := nand.o diff --git a/drivers/net/Makefile b/drivers/net/Makefile index b80a351ece9b..60cfc470da50 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -1,18 +1,10 @@ -# File: drivers/net/Makefile # # Makefile for the Linux network (ethercard) device drivers. # -obj-y := -obj-m := -obj-n := -obj- := - mod-subdirs := appletalk arcnet fc irda tokenring tulip pcmcia wireless \ wan ../acorn/net -O_TARGET := net.o - # All of the (potential) objects that export symbols. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. diff --git a/drivers/parport/Makefile b/drivers/parport/Makefile index 33f94ed7b63f..f0d3a3b16925 100644 --- a/drivers/parport/Makefile +++ b/drivers/parport/Makefile @@ -1,15 +1,6 @@ # # Makefile for the kernel Parallel port device drivers. # -# Note! Parport is the Borg. We have assimilated some other -# drivers in the `char', `net' and `scsi' directories, -# but left them there to allay suspicion. -# -# 7 October 2000, Bartlomiej Zolnierkiewicz <bkz@linux-ide.org> -# Rewritten to use lists instead of if-statements. -# - -O_TARGET := driver.o export-objs := init.o parport_pc.o diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 39c30d5790d6..3752e54f42f0 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -1,15 +1,6 @@ # # Makefile for the PCI bus specific drivers. # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -# Note 2! The CFLAGS definition is now inherited from the -# parent makefile. -# - -O_TARGET := driver.o export-objs := access.o hotplug.o pci-driver.o pci.o pool.o probe.o proc.o search.o diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 2dae24ccdcf3..a0ca2320a09d 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -2,8 +2,6 @@ # Makefile for the kernel pcmcia subsystem (c/o David Hinds) # -O_TARGET := pcmcia.o - export-objs := ds.o cs.o yenta.o pci_socket.o obj-$(CONFIG_PCMCIA) += pcmcia_core.o ds.o diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile index 84b49924f679..34c4129290dd 100644 --- a/drivers/pnp/Makefile +++ b/drivers/pnp/Makefile @@ -2,8 +2,6 @@ # Makefile for the kernel Plug-and-Play device drivers. # -O_TARGET := pnp.o - export-objs := isapnp.o pnpbios_core.o isa-pnp-proc-$(CONFIG_PROC_FS) = isapnp_proc.o diff --git a/drivers/s390/Makefile b/drivers/s390/Makefile index 13f62f9ad354..12a67c040d10 100644 --- a/drivers/s390/Makefile +++ b/drivers/s390/Makefile @@ -2,14 +2,11 @@ # Makefile for the S/390 specific device drivers # -O_TARGET := io.o +mod-subdirs := block char misc net -subdir-y := block char misc net -subdir-m := $(subdir-y) - -obj-y := s390io.o s390mach.o s390dyn.o idals.o ccwcache.o export-objs += ccwcache.o idals.o s390dyn.o s390io.o -obj-y += $(foreach dir,$(subdir-y),$(dir)/s390-$(dir).o) +obj-y += s390io.o s390mach.o s390dyn.o idals.o ccwcache.o +obj-y += block/ char/ misc/ net/ include $(TOPDIR)/Rules.make diff --git a/drivers/s390/block/Makefile b/drivers/s390/block/Makefile index 2f051aa0b12e..79dcf7ea454b 100644 --- a/drivers/s390/block/Makefile +++ b/drivers/s390/block/Makefile @@ -2,8 +2,6 @@ # S/390 block devices # -O_TARGET := s390-block.o - export-objs := dasd.o dasd_eckd_mod-objs := dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile index ecdd02990d5e..d2547652f016 100644 --- a/drivers/s390/char/Makefile +++ b/drivers/s390/char/Makefile @@ -2,8 +2,6 @@ # S/390 character devices # -O_TARGET := s390-char.o - export-objs := hwc_rw.o tub3270-objs := tuball.o tubfs.o tubtty.o \ diff --git a/drivers/s390/misc/Makefile b/drivers/s390/misc/Makefile index e322e3b7ba54..01dea8234de9 100644 --- a/drivers/s390/misc/Makefile +++ b/drivers/s390/misc/Makefile @@ -2,8 +2,6 @@ # S/390 miscellaneous devices # -O_TARGET := s390-misc.o - obj-$(CONFIG_CHANDEV) += chandev.o export-objs += chandev.o diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile index 7ec7e86396b7..e47304d195f7 100644 --- a/drivers/s390/net/Makefile +++ b/drivers/s390/net/Makefile @@ -2,8 +2,6 @@ # S/390 network devices # -O_TARGET := s390-net.o - export-objs := iucv.o fsm.o ctc-objs := ctcmain.o ctctty.o diff --git a/drivers/sbus/Makefile b/drivers/sbus/Makefile index c660b524777b..9507e0a00eeb 100644 --- a/drivers/sbus/Makefile +++ b/drivers/sbus/Makefile @@ -1,27 +1,14 @@ # # Makefile for the linux kernel. # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -# Note 2! The CFLAGS definitions are now in the main makefile... -O_TARGET := sbus_all.o ifneq ($(ARCH),m68k) obj-y := sbus.o dvma.o endif -subdir-y += char -subdir-m += char -obj-$(CONFIG_SBUSCHAR) += char/sunchar.o - -subdir-y += audio -subdir-m += audio +mod-subdirs := char audio -# This is grotty but works around some problems with modules. -ifeq ($(CONFIG_SPARCAUDIO),y) -obj-y += audio/sparcaudio.o -endif +obj-$(CONFIG_SBUSCHAR) += char/ +obj-$(CONFIG_SPARCAUDIO) += audio/ include $(TOPDIR)/Rules.make diff --git a/drivers/sbus/audio/Makefile b/drivers/sbus/audio/Makefile index b5a9edc54e79..f58c53b1ded9 100644 --- a/drivers/sbus/audio/Makefile +++ b/drivers/sbus/audio/Makefile @@ -5,8 +5,6 @@ # Rewritten to use lists instead of if-statements. # -O_TARGET := sparcaudio.o - export-objs := audio.o amd7930.o dbri.o obj-$(CONFIG_SPARCAUDIO) += audio.o diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile index e7fa4a8c20f6..eefdbc182a2e 100644 --- a/drivers/sbus/char/Makefile +++ b/drivers/sbus/char/Makefile @@ -7,8 +7,6 @@ # Rewritten to use lists instead of if-statements. # -O_TARGET := sunchar.o - export-objs := su.o bbc_i2c.o obj-y := sunkbd.o sunkbdmap.o sunmouse.o sunserial.o zs.o diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 383debd24e99..7bb214700e8f 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -18,9 +18,6 @@ CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS CFLAGS_seagate.o = -DARBITRATE -DPARITY -DSEAGATE_USE_ASM - -O_TARGET := scsidrv.o - export-objs := scsi_syms.o 53c700.o mod-subdirs := pcmcia ../acorn/scsi diff --git a/drivers/sgi/Makefile b/drivers/sgi/Makefile index f5cc50a63c37..7196ecf2635a 100644 --- a/drivers/sgi/Makefile +++ b/drivers/sgi/Makefile @@ -5,8 +5,8 @@ # # Character and Audio devices for SGI machines. # -subdir-y += char subdir-m += char -obj-y += char/sgichar.o + +obj-y += char/ include $(TOPDIR)/Rules.make diff --git a/drivers/sgi/char/Makefile b/drivers/sgi/char/Makefile index b6fec19d2f16..72b209b0354e 100644 --- a/drivers/sgi/char/Makefile +++ b/drivers/sgi/char/Makefile @@ -1,13 +1,6 @@ # # Makefile for the linux kernel. # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -# Note 2! The CFLAGS definitions are now in the main makefile... - -O_TARGET := sgichar.o export-objs := newport.o shmiq.o sgicons.o usema.o obj-y := newport.o shmiq.o sgicons.o usema.o streamable.o diff --git a/drivers/telephony/Makefile b/drivers/telephony/Makefile index e8375c96fc60..daf236194204 100644 --- a/drivers/telephony/Makefile +++ b/drivers/telephony/Makefile @@ -1,22 +1,12 @@ # # Makefile for drivers/telephony # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -obj-y := -obj-n := -obj-m := -obj- := export-objs := phonedev.o ixj.o obj-$(CONFIG_PHONE) += phonedev.o obj-$(CONFIG_PHONE_IXJ) += ixj.o obj-$(CONFIG_PHONE_IXJ_PCMCIA) += ixj_pcmcia.o -O_TARGET := telephony.o - include $(TOPDIR)/Rules.make diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index c4549b871006..ffa26853295b 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -2,65 +2,61 @@ # Makefile for the kernel USB device drivers. # -O_TARGET := usbdrv.o - # Object files in subdirectories mod-subdirs := serial -subdir-$(CONFIG_USB) += core - -subdir-$(CONFIG_USB_EHCI_HCD) += host -subdir-$(CONFIG_USB_OHCI_HCD) += host -subdir-$(CONFIG_USB_OHCI) += host -subdir-$(CONFIG_USB_UHCI_ALT) += host -subdir-$(CONFIG_USB_UHCI_HCD_ALT) += host -subdir-$(CONFIG_USB_UHCI_HCD) += host -subdir-$(CONFIG_USB_UHCI) += host - -subdir-$(CONFIG_USB_ACM) += class -subdir-$(CONFIG_USB_AUDIO) += class -subdir-$(CONFIG_USB_BLUETOOTH_TTY) += class -subdir-$(CONFIG_USB_PRINTER) += class - -subdir-$(CONFIG_USB_STORAGE) += storage - -subdir-$(CONFIG_USB_HID) += input -subdir-$(CONFIG_USB_KBD) += input -subdir-$(CONFIG_USB_MOUSE) += input -subdir-$(CONFIG_USB_WACOM) += input - -subdir-$(CONFIG_USB_DABUSB) += media -subdir-$(CONFIG_USB_DSBR) += media -subdir-$(CONFIG_USB_IBMCAM) += media -subdir-$(CONFIG_USB_KONICAWC) += media -subdir-$(CONFIG_USB_OV511) += media -subdir-$(CONFIG_USB_PWC) += media -subdir-$(CONFIG_USB_SE401) += media -subdir-$(CONFIG_USB_STV680) += media -subdir-$(CONFIG_USB_VICAM) += media - -subdir-$(CONFIG_USB_CATC) += net -subdir-$(CONFIG_USB_CDCETHER) += net -subdir-$(CONFIG_USB_KAWETH) += net -subdir-$(CONFIG_USB_PEGASUS) += net -subdir-$(CONFIG_USB_RTL8150) += net -subdir-$(CONFIG_USB_USBNET) += net - -subdir-$(CONFIG_USB_DC2XX) += image -subdir-$(CONFIG_USB_HPUSBSCSI) += image -subdir-$(CONFIG_USB_MDC800) += image -subdir-$(CONFIG_USB_MICROTEK) += image -subdir-$(CONFIG_USB_SCANNER) += image - -subdir-$(CONFIG_USB_SERIAL) += serial - -subdir-$(CONFIG_USB_AUERSWALD) += misc -subdir-$(CONFIG_USB_BRLVGER) += misc -subdir-$(CONFIG_USB_EMI26) += misc -subdir-$(CONFIG_USB_RIO500) += misc -subdir-$(CONFIG_USB_TIGL) += misc -subdir-$(CONFIG_USB_USS720) += misc - -obj-y += $(join $(subdir-y),$(subdir-y:%=/%.o)) +obj-$(CONFIG_USB) += core/ + +obj-$(CONFIG_USB_EHCI_HCD) += host/ +obj-$(CONFIG_USB_OHCI_HCD) += host/ +obj-$(CONFIG_USB_OHCI) += host/ +obj-$(CONFIG_USB_UHCI_ALT) += host/ +obj-$(CONFIG_USB_UHCI_HCD_ALT) += host/ +obj-$(CONFIG_USB_UHCI_HCD) += host/ +obj-$(CONFIG_USB_UHCI) += host/ + +obj-$(CONFIG_USB_ACM) += class/ +obj-$(CONFIG_USB_AUDIO) += class/ +obj-$(CONFIG_USB_BLUETOOTH_TTY) += class/ +obj-$(CONFIG_USB_PRINTER) += class/ + +obj-$(CONFIG_USB_STORAGE) += storage/ + +obj-$(CONFIG_USB_HID) += input/ +obj-$(CONFIG_USB_KBD) += input/ +obj-$(CONFIG_USB_MOUSE) += input/ +obj-$(CONFIG_USB_WACOM) += input/ + +obj-$(CONFIG_USB_DABUSB) += media/ +obj-$(CONFIG_USB_DSBR) += media/ +obj-$(CONFIG_USB_IBMCAM) += media/ +obj-$(CONFIG_USB_KONICAWC) += media/ +obj-$(CONFIG_USB_OV511) += media/ +obj-$(CONFIG_USB_PWC) += media/ +obj-$(CONFIG_USB_SE401) += media/ +obj-$(CONFIG_USB_STV680) += media/ +obj-$(CONFIG_USB_VICAM) += media/ + +obj-$(CONFIG_USB_CATC) += net/ +obj-$(CONFIG_USB_CDCETHER) += net/ +obj-$(CONFIG_USB_KAWETH) += net/ +obj-$(CONFIG_USB_PEGASUS) += net/ +obj-$(CONFIG_USB_RTL8150) += net/ +obj-$(CONFIG_USB_USBNET) += net/ + +obj-$(CONFIG_USB_DC2XX) += image/ +obj-$(CONFIG_USB_HPUSBSCSI) += image/ +obj-$(CONFIG_USB_MDC800) += image/ +obj-$(CONFIG_USB_MICROTEK) += image/ +obj-$(CONFIG_USB_SCANNER) += image/ + +obj-$(CONFIG_USB_SERIAL) += serial/ + +obj-$(CONFIG_USB_AUERSWALD) += misc/ +obj-$(CONFIG_USB_BRLVGER) += misc/ +obj-$(CONFIG_USB_EMI26) += misc/ +obj-$(CONFIG_USB_RIO500) += misc/ +obj-$(CONFIG_USB_TIGL) += misc/ +obj-$(CONFIG_USB_USS720) += misc/ include $(TOPDIR)/Rules.make diff --git a/drivers/usb/class/Makefile b/drivers/usb/class/Makefile index eee74deb446c..1540dda8e351 100644 --- a/drivers/usb/class/Makefile +++ b/drivers/usb/class/Makefile @@ -3,8 +3,6 @@ # (one step up from the misc category) # -O_TARGET := class.o - obj-$(CONFIG_USB_ACM) += cdc-acm.o obj-$(CONFIG_USB_AUDIO) += audio.o obj-$(CONFIG_USB_BLUETOOTH_TTY) += bluetty.o diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile index 844c48f50e47..3b5293b9bba9 100644 --- a/drivers/usb/core/Makefile +++ b/drivers/usb/core/Makefile @@ -2,8 +2,6 @@ # Makefile for USB Core files and filesystem # -O_TARGET := core.o - export-objs := usb.o hcd.o usbcore-objs := usb.o usb-debug.o hub.o hcd.o diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 14bb932676fd..d3db6f0aaf90 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -3,8 +3,6 @@ # framework and drivers # -O_TARGET := host.o - obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o obj-$(CONFIG_USB_UHCI_HCD) += usb-uhci-hcd.o diff --git a/drivers/usb/image/Makefile b/drivers/usb/image/Makefile index a2f278fe3faf..24efb2d2a024 100644 --- a/drivers/usb/image/Makefile +++ b/drivers/usb/image/Makefile @@ -2,8 +2,6 @@ # Makefile for USB Image drivers # -O_TARGET := image.o - obj-$(CONFIG_USB_MDC800) += mdc800.o obj-$(CONFIG_USB_HPUSBSCSI) += hpusbscsi.o obj-$(CONFIG_USB_MICROTEK) += microtek.o diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile index 52a2454a95f0..1a1fe5537c72 100644 --- a/drivers/usb/input/Makefile +++ b/drivers/usb/input/Makefile @@ -2,8 +2,6 @@ # Makefile for the USB input drivers # -O_TARGET := input.o - # Multipart objects. hid-objs := hid-core.o diff --git a/drivers/usb/media/Makefile b/drivers/usb/media/Makefile index 1eb02f0872a4..b3aa1f558bbe 100644 --- a/drivers/usb/media/Makefile +++ b/drivers/usb/media/Makefile @@ -2,8 +2,6 @@ # Makefile for USB Media drivers # -O_TARGET := media.o - export-objs := ov511.o pwc-uncompress.o usbvideo.o pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile index 88cdb172a452..e62a24e41cf1 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile @@ -3,8 +3,6 @@ # (the ones that don't fit into any other categories) # -O_TARGET := misc.o - obj-$(CONFIG_USB_AUERSWALD) += auerswald.o obj-$(CONFIG_USB_BRLVGER) += brlvger.o obj-$(CONFIG_USB_EMI26) += emi26.o diff --git a/drivers/usb/net/Makefile b/drivers/usb/net/Makefile index 2df6b7dd2299..bf1fd074c10e 100644 --- a/drivers/usb/net/Makefile +++ b/drivers/usb/net/Makefile @@ -2,8 +2,6 @@ # Makefile for USB Network drivers # -O_TARGET := net.o - obj-$(CONFIG_USB_CATC) += catc.o obj-$(CONFIG_USB_CDCETHER) += cdc-ether.o obj-$(CONFIG_USB_KAWETH) += kaweth.o diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile index 144d4f8d301e..962d94746de6 100644 --- a/drivers/usb/serial/Makefile +++ b/drivers/usb/serial/Makefile @@ -2,8 +2,6 @@ # Makefile for the USB serial device drivers. # -O_TARGET := serial.o - # Object file lists. obj-$(CONFIG_USB_SERIAL) += usbserial.o diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile index 1de958001012..96b5356f97c3 100644 --- a/drivers/usb/storage/Makefile +++ b/drivers/usb/storage/Makefile @@ -5,7 +5,6 @@ # Rewritten to use lists instead of if-statements. # -O_TARGET := storage.o EXTRA_CFLAGS := -I../../scsi/ obj-$(CONFIG_USB_STORAGE) += usb-storage.o diff --git a/drivers/video/Makefile b/drivers/video/Makefile index ee0f4b63f414..96043d63408d 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -2,8 +2,6 @@ # 5 Aug 1999, James Simmons, <mailto:jsimmons@users.sf.net> # Rewritten to use lists instead of if-statements. -O_TARGET := video.o - mod-subdirs := matrox # All of the (potential) objects that export symbols. diff --git a/drivers/zorro/Makefile b/drivers/zorro/Makefile index f5a035c9b769..0e35d7b20cea 100644 --- a/drivers/zorro/Makefile +++ b/drivers/zorro/Makefile @@ -1,15 +1,6 @@ # # Makefile for the Zorro bus specific drivers. # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -# Note 2! The CFLAGS definition is now inherited from the -# parent makefile. -# - -O_TARGET := driver.o export-objs := zorro.o |