diff options
| author | Brian Gerst <bgerst@didntduck.org> | 2002-12-14 19:41:42 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2002-12-14 19:41:42 -0800 |
| commit | b4499c7261c3f7d75506132416995affe83d829b (patch) | |
| tree | 8c0f6eba1c7a920924233fd10656ea143711a3e6 | |
| parent | 1cec92af3902aff8d6c4e922765a5dd1c3ada965 (diff) | |
[PATCH] Remove Rules.make from Makefiles (2/3)
Makefiles no longer need to include Rules.make, which is currently an
empty file. This patch removes it from the drivers tree Makefiles.
128 files changed, 0 insertions, 303 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 7c605f3d8673..a6ce89683e2c 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -44,5 +44,3 @@ obj-$(CONFIG_BT) += bluetooth/ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ obj-$(CONFIG_ISDN_BOOL) += isdn/ obj-$(CONFIG_MCA) += mca/ - -include $(TOPDIR)/Rules.make diff --git a/drivers/acorn/block/Makefile b/drivers/acorn/block/Makefile index aadc45fac126..38a9afe8e03f 100644 --- a/drivers/acorn/block/Makefile +++ b/drivers/acorn/block/Makefile @@ -7,5 +7,3 @@ mfmhd_mod-objs := mfmhd.o mfm.o obj-$(CONFIG_BLK_DEV_FD1772) += fd1772_mod.o obj-$(CONFIG_BLK_DEV_MFM) += mfmhd_mod.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/acorn/char/Makefile b/drivers/acorn/char/Makefile index 7772fa8ba698..00628fecca14 100644 --- a/drivers/acorn/char/Makefile +++ b/drivers/acorn/char/Makefile @@ -8,8 +8,6 @@ obj-$(CONFIG_ARCH_ACORN) += i2c.o pcf8583.o obj-$(CONFIG_L7200_KEYB) += defkeymap-l7200.o keyb_l7200.o obj-y += $(obj-$(MACHINE)) -include $(TOPDIR)/Rules.make - $(obj)/defkeymap-acorn.o: $(obj)/defkeymap-acorn.c # Uncomment if you're changing the keymap and have an appropriate diff --git a/drivers/acorn/net/Makefile b/drivers/acorn/net/Makefile index d9d35dfb8349..a567f4cdd75b 100644 --- a/drivers/acorn/net/Makefile +++ b/drivers/acorn/net/Makefile @@ -6,5 +6,3 @@ obj-$(CONFIG_ARM_ETHERH) += etherh.o obj-$(CONFIG_ARM_ETHER3) += ether3.o obj-$(CONFIG_ARM_ETHER1) += ether1.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/acorn/scsi/Makefile b/drivers/acorn/scsi/Makefile index f222a3c01178..fe844899dcfd 100644 --- a/drivers/acorn/scsi/Makefile +++ b/drivers/acorn/scsi/Makefile @@ -13,5 +13,3 @@ obj-$(CONFIG_SCSI_ECOSCSI) += ecoscsi.o obj-$(CONFIG_SCSI_OAK1) += oak.o obj-$(CONFIG_SCSI_POWERTECSCSI) += powertec.o fas216.o queue.o msgqueue.o obj-$(CONFIG_SCSI_EESOXSCSI) += eesox.o fas216.o queue.o msgqueue.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 9311d367e96e..a403bf0f98e7 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -48,5 +48,3 @@ obj-$(CONFIG_ACPI_SLEEP) += sleep.o obj-$(CONFIG_ACPI_NUMA) += numa.o obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o obj-$(CONFIG_ACPI_BUS) += scan.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/acpi/dispatcher/Makefile b/drivers/acpi/dispatcher/Makefile index 3aac0f531c25..eb7e602a83cd 100644 --- a/drivers/acpi/dispatcher/Makefile +++ b/drivers/acpi/dispatcher/Makefile @@ -7,5 +7,3 @@ obj-y := dsfield.o dsmthdat.o dsopcode.o dswexec.o dswscope.o \ dsinit.o EXTRA_CFLAGS += $(ACPI_CFLAGS) - -include $(TOPDIR)/Rules.make diff --git a/drivers/acpi/events/Makefile b/drivers/acpi/events/Makefile index 3916c672a74a..a1e5de7e6021 100644 --- a/drivers/acpi/events/Makefile +++ b/drivers/acpi/events/Makefile @@ -7,5 +7,3 @@ obj-y := evevent.o evregion.o evsci.o evxfevnt.o \ evgpe.o EXTRA_CFLAGS += $(ACPI_CFLAGS) - -include $(TOPDIR)/Rules.make diff --git a/drivers/acpi/executer/Makefile b/drivers/acpi/executer/Makefile index d40113e8dda7..e09998aa012f 100644 --- a/drivers/acpi/executer/Makefile +++ b/drivers/acpi/executer/Makefile @@ -8,5 +8,3 @@ obj-y := exconfig.o exfield.o exnames.o exoparg6.o exresolv.o exstorob.o\ exdump.o exmutex.o exoparg3.o exresnte.o exstoren.o EXTRA_CFLAGS += $(ACPI_CFLAGS) - -include $(TOPDIR)/Rules.make diff --git a/drivers/acpi/hardware/Makefile b/drivers/acpi/hardware/Makefile index d401b01fdd83..97989bc85b1b 100644 --- a/drivers/acpi/hardware/Makefile +++ b/drivers/acpi/hardware/Makefile @@ -5,5 +5,3 @@ obj-y := hwacpi.o hwgpe.o hwregs.o hwsleep.o hwtimer.o EXTRA_CFLAGS += $(ACPI_CFLAGS) - -include $(TOPDIR)/Rules.make diff --git a/drivers/acpi/namespace/Makefile b/drivers/acpi/namespace/Makefile index 63e384689c28..9462af17424d 100644 --- a/drivers/acpi/namespace/Makefile +++ b/drivers/acpi/namespace/Makefile @@ -8,5 +8,3 @@ obj-y := nsaccess.o nsdumpdv.o nsload.o nssearch.o nsxfeval.o \ nsparse.o EXTRA_CFLAGS += $(ACPI_CFLAGS) - -include $(TOPDIR)/Rules.make diff --git a/drivers/acpi/parser/Makefile b/drivers/acpi/parser/Makefile index fdb8d3bf7e74..bbdd286c660d 100644 --- a/drivers/acpi/parser/Makefile +++ b/drivers/acpi/parser/Makefile @@ -6,5 +6,3 @@ obj-y := psargs.o psparse.o pstree.o pswalk.o \ psopcode.o psscope.o psutils.o psxface.o EXTRA_CFLAGS += $(ACPI_CFLAGS) - -include $(TOPDIR)/Rules.make diff --git a/drivers/acpi/resources/Makefile b/drivers/acpi/resources/Makefile index 98ce5d291891..9916b65725de 100644 --- a/drivers/acpi/resources/Makefile +++ b/drivers/acpi/resources/Makefile @@ -6,5 +6,3 @@ obj-y := rsaddr.o rscreate.o rsio.o rslist.o rsmisc.o rsxface.o \ rscalc.o rsdump.o rsirq.o rsmemory.o rsutils.o EXTRA_CFLAGS += $(ACPI_CFLAGS) - -include $(TOPDIR)/Rules.make diff --git a/drivers/acpi/tables/Makefile b/drivers/acpi/tables/Makefile index 25d49ba95dd9..aa4c69594d97 100644 --- a/drivers/acpi/tables/Makefile +++ b/drivers/acpi/tables/Makefile @@ -6,5 +6,3 @@ obj-y := tbconvrt.o tbget.o tbrsdt.o tbxface.o \ tbgetall.o tbinstal.o tbutils.o tbxfroot.o EXTRA_CFLAGS += $(ACPI_CFLAGS) - -include $(TOPDIR)/Rules.make diff --git a/drivers/acpi/utilities/Makefile b/drivers/acpi/utilities/Makefile index 1162287e6410..939c447dd52a 100644 --- a/drivers/acpi/utilities/Makefile +++ b/drivers/acpi/utilities/Makefile @@ -6,5 +6,3 @@ obj-y := utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \ utcopy.o utdelete.o utglobal.o utmath.o utobject.o EXTRA_CFLAGS += $(ACPI_CFLAGS) - -include $(TOPDIR)/Rules.make diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile index 00c3ccb5debd..a4a5b82556b5 100644 --- a/drivers/atm/Makefile +++ b/drivers/atm/Makefile @@ -51,8 +51,6 @@ ifeq ($(CONFIG_ATM_FORE200E_SBA),y) endif endif -include $(TOPDIR)/Rules.make - # FORE Systems 200E-series firmware magic $(obj)/fore200e_pca_fw.c: $(patsubst "%", %, $(CONFIG_ATM_FORE200E_PCA_FW)) \ $(obj)/fore200e_mkfirm diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 7f716bb91548..f953910ff586 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile @@ -12,5 +12,3 @@ obj-$(CONFIG_HOTPLUG) += hotplug.o export-objs := core.o power.o sys.o bus.o driver.o \ class.o intf.o platform.o firmware.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/base/fs/Makefile b/drivers/base/fs/Makefile index f94c734b258f..ae7ccaa14359 100644 --- a/drivers/base/fs/Makefile +++ b/drivers/base/fs/Makefile @@ -1,5 +1,3 @@ obj-y := device.o export-objs := device.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 6c22bb8963d6..091b61c55852 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -31,5 +31,3 @@ obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o obj-$(CONFIG_BLK_DEV_UMEM) += umem.o obj-$(CONFIG_BLK_DEV_NBD) += nbd.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/block/paride/Makefile b/drivers/block/paride/Makefile index b1294e64f414..5ba10d95cdb3 100644 --- a/drivers/block/paride/Makefile +++ b/drivers/block/paride/Makefile @@ -28,5 +28,3 @@ obj-$(CONFIG_PARIDE_PCD) += pcd.o obj-$(CONFIG_PARIDE_PF) += pf.o obj-$(CONFIG_PARIDE_PT) += pt.o obj-$(CONFIG_PARIDE_PG) += pg.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile index 397b3d46eb3b..a5e7b04f65f8 100644 --- a/drivers/bluetooth/Makefile +++ b/drivers/bluetooth/Makefile @@ -13,5 +13,3 @@ hci_uart-y := hci_ldisc.o hci_uart-$(CONFIG_BT_HCIUART_H4) += hci_h4.o hci_uart-$(CONFIG_BT_HCIUART_BCSP) += hci_bcsp.o hci_uart-objs := $(hci_uart-y) - -include $(TOPDIR)/Rules.make diff --git a/drivers/cdrom/Makefile b/drivers/cdrom/Makefile index cddac1b5f798..00bf471c5d13 100644 --- a/drivers/cdrom/Makefile +++ b/drivers/cdrom/Makefile @@ -36,7 +36,3 @@ obj-$(CONFIG_OPTCD) += optcd.o obj-$(CONFIG_SBPCD) += sbpcd.o cdrom.o obj-$(CONFIG_SJCD) += sjcd.o obj-$(CONFIG_CDU535) += sonycd535.o - -# Hand off to Rules.make. - -include $(TOPDIR)/Rules.make diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 8b1b9a2a3c1c..97ca5d8b3c7d 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -87,8 +87,6 @@ obj-$(CONFIG_PCMCIA) += pcmcia/ # Files generated that shall be removed upon make clean clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c -include $(TOPDIR)/Rules.make - $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(call do_cmd,CONMK $@,$(objtree)/scripts/conmakehash $< > $@) diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile index faf5c13bfef0..1e8af0cdbdb1 100644 --- a/drivers/char/drm/Makefile +++ b/drivers/char/drm/Makefile @@ -19,5 +19,3 @@ obj-$(CONFIG_DRM_MGA) += mga.o obj-$(CONFIG_DRM_I810) += i810.o obj-$(CONFIG_DRM_I830) += i830.o obj-$(CONFIG_DRM_FFB) += ffb.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/char/ftape/Makefile b/drivers/char/ftape/Makefile index 7bcf0642455e..0e67d2f8b7ec 100644 --- a/drivers/char/ftape/Makefile +++ b/drivers/char/ftape/Makefile @@ -26,5 +26,3 @@ obj-$(CONFIG_FTAPE) += lowlevel/ obj-$(CONFIG_ZFTAPE) += zftape/ obj-$(CONFIG_ZFT_COMPRESSOR) += compressor/ - -include $(TOPDIR)/Rules.make diff --git a/drivers/char/ftape/compressor/Makefile b/drivers/char/ftape/compressor/Makefile index 8d9ded86b747..1fbd6c4019db 100644 --- a/drivers/char/ftape/compressor/Makefile +++ b/drivers/char/ftape/compressor/Makefile @@ -29,5 +29,3 @@ obj-$(CONFIG_ZFT_COMPRESSOR) += zft-compressor.o zft-compressor-objs := zftape-compress.o lzrw3.o CFLAGS_lzrw3.o := -O6 -funroll-all-loops - -include $(TOPDIR)/Rules.make diff --git a/drivers/char/ftape/lowlevel/Makefile b/drivers/char/ftape/lowlevel/Makefile index c2676897f4b5..e8d2bde6cf3f 100644 --- a/drivers/char/ftape/lowlevel/Makefile +++ b/drivers/char/ftape/lowlevel/Makefile @@ -43,6 +43,3 @@ endif ifeq ($(CONFIG_FT_PROC_FS),y) ftape-objs += ftape-proc.o endif - -include $(TOPDIR)/Rules.make - diff --git a/drivers/char/ftape/zftape/Makefile b/drivers/char/ftape/zftape/Makefile index 9ebe70f6c837..d42152045f66 100644 --- a/drivers/char/ftape/zftape/Makefile +++ b/drivers/char/ftape/zftape/Makefile @@ -36,6 +36,3 @@ zftape-objs := zftape-rw.o zftape-ctl.o zftape-read.o \ zftape-init.o zftape-buffers.o zftape_syms.o EXTRA_CFLAGS := -DZFT_OBSOLETE - -include $(TOPDIR)/Rules.make - diff --git a/drivers/char/mwave/Makefile b/drivers/char/mwave/Makefile index 8efb3a877271..754c9e2058ed 100644 --- a/drivers/char/mwave/Makefile +++ b/drivers/char/mwave/Makefile @@ -13,5 +13,3 @@ mwave-objs := mwavedd.o smapi.o tp3780i.o 3780i.o # To compile in lots (~20 KiB) of run-time enablable printk()s for debugging: EXTRA_CFLAGS += -DMW_TRACE - -include $(TOPDIR)/Rules.make diff --git a/drivers/char/pcmcia/Makefile b/drivers/char/pcmcia/Makefile index a1db3f706121..1fcd4c591958 100644 --- a/drivers/char/pcmcia/Makefile +++ b/drivers/char/pcmcia/Makefile @@ -5,5 +5,3 @@ # obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/char/rio/Makefile b/drivers/char/rio/Makefile index 2ca33bd83173..bce2bd1204ed 100644 --- a/drivers/char/rio/Makefile +++ b/drivers/char/rio/Makefile @@ -10,5 +10,3 @@ obj-$(CONFIG_RIO) += rio.o rio-objs := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \ rioparam.o riopcicopy.o rioroute.o riotable.o riotty.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile index 83de90df7543..cdd69eb962ad 100644 --- a/drivers/char/watchdog/Makefile +++ b/drivers/char/watchdog/Makefile @@ -23,5 +23,3 @@ obj-$(CONFIG_MACHZ_WDT) += machzwd.o obj-$(CONFIG_SH_WDT) += shwdt.o obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/dio/Makefile b/drivers/dio/Makefile index 522b2e25ba8c..33496dfcad0b 100644 --- a/drivers/dio/Makefile +++ b/drivers/dio/Makefile @@ -3,5 +3,3 @@ # obj-y := dio.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/fc4/Makefile b/drivers/fc4/Makefile index 37b66772421c..b9cf156fa294 100644 --- a/drivers/fc4/Makefile +++ b/drivers/fc4/Makefile @@ -9,5 +9,3 @@ fc4-objs := fc.o fc_syms.o obj-$(CONFIG_FC4) += fc4.o obj-$(CONFIG_FC4_SOC) += soc.o obj-$(CONFIG_FC4_SOCAL) += socal.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/hotplug/Makefile b/drivers/hotplug/Makefile index 817fedc35ef5..47c08533f38c 100644 --- a/drivers/hotplug/Makefile +++ b/drivers/hotplug/Makefile @@ -45,6 +45,3 @@ endif ifeq ($(CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM),y) cpqphp-objs += cpqphp_nvram.o endif - - -include $(TOPDIR)/Rules.make diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 56c6474c5611..924e971081b7 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -21,6 +21,3 @@ obj-$(CONFIG_I2C_PROC) += i2c-proc.o # This is needed for automatic patch generation: sensors code starts here # This is needed for automatic patch generation: sensors code ends here - -include $(TOPDIR)/Rules.make - diff --git a/drivers/ide/Makefile b/drivers/ide/Makefile index 30cc8720f36b..c08844b70152 100644 --- a/drivers/ide/Makefile +++ b/drivers/ide/Makefile @@ -30,5 +30,3 @@ obj-$(CONFIG_PROC_FS) += ide-proc.o endif obj-$(CONFIG_BLK_DEV_IDE) += legacy/ ppc/ arm/ - -include $(TOPDIR)/Rules.make diff --git a/drivers/ide/arm/Makefile b/drivers/ide/arm/Makefile index 03a20cad909a..ba897493dd1e 100644 --- a/drivers/ide/arm/Makefile +++ b/drivers/ide/arm/Makefile @@ -3,5 +3,3 @@ obj-$(CONFIG_BLK_DEV_IDE_ICSIDE) += icside.o obj-$(CONFIG_BLK_DEV_IDE_RAPIDE) += rapide.o EXTRA_CFLAGS := -Idrivers/ide - -include $(TOPDIR)/Rules.make diff --git a/drivers/ide/legacy/Makefile b/drivers/ide/legacy/Makefile index acc8bb67c802..a5f8f6c6bd90 100644 --- a/drivers/ide/legacy/Makefile +++ b/drivers/ide/legacy/Makefile @@ -18,5 +18,3 @@ obj-$(CONFIG_BLK_DEV_IDECS) += ide-cs.o obj-$(CONFIG_BLK_DEV_HD) += hd.o EXTRA_CFLAGS := -Idrivers/ide - -include $(TOPDIR)/Rules.make diff --git a/drivers/ide/pci/Makefile b/drivers/ide/pci/Makefile index e594ae249e82..6081c43af4d3 100644 --- a/drivers/ide/pci/Makefile +++ b/drivers/ide/pci/Makefile @@ -34,5 +34,3 @@ obj-$(CONFIG_BLK_DEV_VIA82CXXX) += via82cxxx.o obj-$(CONFIG_BLK_DEV_GENERIC) += generic.o EXTRA_CFLAGS := -Idrivers/ide - -include $(TOPDIR)/Rules.make diff --git a/drivers/ide/ppc/Makefile b/drivers/ide/ppc/Makefile index 40edfffeb33f..6fc3fa38f1c7 100644 --- a/drivers/ide/ppc/Makefile +++ b/drivers/ide/ppc/Makefile @@ -4,5 +4,3 @@ obj-$(CONFIG_BLK_DEV_IDE_PMAC) += pmac.o obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o EXTRA_CFLAGS := -Idrivers/ide - -include $(TOPDIR)/Rules.make diff --git a/drivers/ieee1394/Makefile b/drivers/ieee1394/Makefile index 59d51d5e518e..e105b7958802 100644 --- a/drivers/ieee1394/Makefile +++ b/drivers/ieee1394/Makefile @@ -17,5 +17,3 @@ obj-$(CONFIG_IEEE1394_DV1394) += dv1394.o obj-$(CONFIG_IEEE1394_ETH1394) += eth1394.o obj-$(CONFIG_IEEE1394_AMDTP) += amdtp.o obj-$(CONFIG_IEEE1394_CMP) += cmp.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/input/Makefile b/drivers/input/Makefile index f7232ccdf1ec..471aa6bff7c3 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -21,7 +21,3 @@ obj-$(CONFIG_INPUT_MOUSE) += mouse/ obj-$(CONFIG_INPUT_JOYSTICK) += joystick/ obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/ obj-$(CONFIG_INPUT_MISC) += misc/ - -# The global Rules.make. - -include $(TOPDIR)/Rules.make diff --git a/drivers/input/gameport/Makefile b/drivers/input/gameport/Makefile index ac1991701f6a..084ea95deaf5 100644 --- a/drivers/input/gameport/Makefile +++ b/drivers/input/gameport/Makefile @@ -15,7 +15,3 @@ obj-$(CONFIG_GAMEPORT_FM801) += fm801-gp.o obj-$(CONFIG_GAMEPORT_L4) += lightning.o obj-$(CONFIG_GAMEPORT_NS558) += ns558.o obj-$(CONFIG_GAMEPORT_VORTEX) += vortex.o - -# The global Rules.make. - -include $(TOPDIR)/Rules.make diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile index 636bf23e5a46..5231f6ff75b8 100644 --- a/drivers/input/joystick/Makefile +++ b/drivers/input/joystick/Makefile @@ -28,7 +28,3 @@ obj-$(CONFIG_JOYSTICK_TWIDJOY) += twidjoy.o obj-$(CONFIG_JOYSTICK_WARRIOR) += warrior.o obj-$(CONFIG_JOYSTICK_IFORCE) += iforce/ - -# The global Rules.make. - -include $(TOPDIR)/Rules.make diff --git a/drivers/input/joystick/iforce/Makefile b/drivers/input/joystick/iforce/Makefile index 3dc69c195ef7..96a0771723b6 100644 --- a/drivers/input/joystick/iforce/Makefile +++ b/drivers/input/joystick/iforce/Makefile @@ -18,7 +18,3 @@ ifeq ($(CONFIG_JOYSTICK_IFORCE_USB),y) endif EXTRA_CFLAGS = -Werror-implicit-function-declaration - -# The global Rules.make. - -include $(TOPDIR)/Rules.make diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index 474d915d34f5..9d82ad5a5931 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile @@ -10,7 +10,3 @@ obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o - -# The global Rules.make. - -include $(TOPDIR)/Rules.make diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile index 4d5ba8de6922..7ea1c35c29ea 100644 --- a/drivers/input/mouse/Makefile +++ b/drivers/input/mouse/Makefile @@ -12,7 +12,3 @@ obj-$(CONFIG_MOUSE_MAPLE) += maplemouse.o obj-$(CONFIG_MOUSE_PC110PAD) += pc110pad.o obj-$(CONFIG_MOUSE_PS2) += psmouse.o obj-$(CONFIG_MOUSE_SERIAL) += sermouse.o - -# The global Rules.make. - -include $(TOPDIR)/Rules.make diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile index dd67a77e6f08..a24db5e01afe 100644 --- a/drivers/input/serio/Makefile +++ b/drivers/input/serio/Makefile @@ -17,7 +17,3 @@ obj-$(CONFIG_SERIO_RPCKBD) += rpckbd.o obj-$(CONFIG_SERIO_SA1111) += sa1111ps2.o obj-$(CONFIG_SERIO_AMBAKMI) += ambakmi.o obj-$(CONFIG_SERIO_Q40KBD) += q40kbd.o - -# The global Rules.make. - -include $(TOPDIR)/Rules.make diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 6daed90c9662..421890f61c92 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -6,7 +6,3 @@ obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o - -# The global Rules.make. - -include $(TOPDIR)/Rules.make diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile index 6fc7251f7513..b296a45294ab 100644 --- a/drivers/macintosh/Makefile +++ b/drivers/macintosh/Makefile @@ -34,8 +34,3 @@ obj-$(CONFIG_ADB_MACIISI) += via-maciisi.o obj-$(CONFIG_ADB_IOP) += adb-iop.o obj-$(CONFIG_ADB_PMU68K) += via-pmu68k.o obj-$(CONFIG_ADB_MACIO) += macio-adb.o - -# The global Rules.make. - -include $(TOPDIR)/Rules.make - diff --git a/drivers/mca/Makefile b/drivers/mca/Makefile index ecdc77002576..1aad9751a345 100644 --- a/drivers/mca/Makefile +++ b/drivers/mca/Makefile @@ -6,5 +6,3 @@ obj-$(CONFIG_MCA_PROC_FS) += mca-proc.o obj-$(CONFIG_MCA_LEGACY) += mca-legacy.o export-objs := mca-bus.o mca-legacy.o mca-proc.o mca-driver.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/md/Makefile b/drivers/md/Makefile index 4000dc490f7b..a67bcaf83f7f 100644 --- a/drivers/md/Makefile +++ b/drivers/md/Makefile @@ -18,6 +18,3 @@ obj-$(CONFIG_MD_RAID5) += raid5.o xor.o obj-$(CONFIG_MD_MULTIPATH) += multipath.o obj-$(CONFIG_BLK_DEV_MD) += md.o obj-$(CONFIG_BLK_DEV_DM) += dm-mod.o - -include $(TOPDIR)/Rules.make - diff --git a/drivers/media/Makefile b/drivers/media/Makefile index 37556733e5a8..f845f96c85e8 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile @@ -3,5 +3,3 @@ # obj-y := video/ radio/ dvb/ - -include $(TOPDIR)/Rules.make diff --git a/drivers/media/dvb/Makefile b/drivers/media/dvb/Makefile index ad647fcfe3f1..3290afb801e6 100644 --- a/drivers/media/dvb/Makefile +++ b/drivers/media/dvb/Makefile @@ -3,5 +3,3 @@ # obj-y := dvb-core/ frontends/ av7110/ - -include $(TOPDIR)/Rules.make diff --git a/drivers/media/dvb/av7110/Makefile b/drivers/media/dvb/av7110/Makefile index 301a732168f7..629fae70b2db 100644 --- a/drivers/media/dvb/av7110/Makefile +++ b/drivers/media/dvb/av7110/Makefile @@ -7,6 +7,3 @@ dvb-ttpci-objs := saa7146_core.o saa7146_v4l.o av7110.o av7110_ir.o obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ - -include $(TOPDIR)/Rules.make - diff --git a/drivers/media/dvb/dvb-core/Makefile b/drivers/media/dvb/dvb-core/Makefile index a32a5f5530d5..8bc7b71162c7 100644 --- a/drivers/media/dvb/dvb-core/Makefile +++ b/drivers/media/dvb/dvb-core/Makefile @@ -8,6 +8,3 @@ dvb-core-objs = dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \ dvb_frontend.o dvb_i2c.o dvb_net.o dvb_ksyms.o obj-$(CONFIG_DVB_CORE) += dvb-core.o - -include $(TOPDIR)/Rules.make - diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile index c693af892d57..61bbf22c8351 100644 --- a/drivers/media/dvb/frontends/Makefile +++ b/drivers/media/dvb/frontends/Makefile @@ -11,6 +11,3 @@ obj-$(CONFIG_DVB_ALPS_TDMB7) += alps_tdmb7.o obj-$(CONFIG_DVB_GRUNDIG_29504_491) += grundig_29504-491.o obj-$(CONFIG_DVB_GRUNDIG_29504_401) += grundig_29504-401.o obj-$(CONFIG_DVB_VES1820) += ves1820.o - -include $(TOPDIR)/Rules.make - diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile index 81b646f0ef53..2b3721c5a58b 100644 --- a/drivers/media/radio/Makefile +++ b/drivers/media/radio/Makefile @@ -24,5 +24,3 @@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o obj-$(CONFIG_RADIO_TRUST) += radio-trust.o obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 935b17f4401a..8a02f8a89e7b 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -37,5 +37,3 @@ obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o obj-$(CONFIG_VIDEO_MEYE) += meye.o obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ tuner.o tda9887.o video-buf.o obj-$(CONFIG_TUNER_3036) += tuner-3036.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/media/video/saa7134/Makefile b/drivers/media/video/saa7134/Makefile index 540bfe41e527..b41959db10d4 100644 --- a/drivers/media/video/saa7134/Makefile +++ b/drivers/media/video/saa7134/Makefile @@ -6,6 +6,3 @@ saa7134-objs := saa7134-cards.o saa7134-core.o saa7134-i2c.o \ obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o EXTRA_CFLAGS = -I$(src)/.. - -include $(TOPDIR)/Rules.make - diff --git a/drivers/message/Makefile b/drivers/message/Makefile index 8fdb1bfb5e44..97ef5a01ad11 100644 --- a/drivers/message/Makefile +++ b/drivers/message/Makefile @@ -4,6 +4,3 @@ obj-$(CONFIG_I2O) += i2o/ obj-$(CONFIG_FUSION) += fusion/ - -include $(TOPDIR)/Rules.make - diff --git a/drivers/message/fusion/Makefile b/drivers/message/fusion/Makefile index d623659f4bb0..ec175cec26fc 100644 --- a/drivers/message/fusion/Makefile +++ b/drivers/message/fusion/Makefile @@ -52,5 +52,3 @@ obj-$(CONFIG_FUSION) += mptbase.o mptscsih.o obj-$(CONFIG_FUSION_ISENSE) += isense.o obj-$(CONFIG_FUSION_CTL) += mptctl.o obj-$(CONFIG_FUSION_LAN) += mptlan.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/message/i2o/Makefile b/drivers/message/i2o/Makefile index 03a45ba12e50..8abc1a975d19 100644 --- a/drivers/message/i2o/Makefile +++ b/drivers/message/i2o/Makefile @@ -13,6 +13,3 @@ obj-$(CONFIG_I2O_BLOCK) += i2o_block.o obj-$(CONFIG_I2O_LAN) += i2o_lan.o obj-$(CONFIG_I2O_SCSI) += i2o_scsi.o obj-$(CONFIG_I2O_PROC) += i2o_proc.o - -include $(TOPDIR)/Rules.make - diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 5ce866f84241..ebf0c34fdc72 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -2,4 +2,3 @@ # Makefile for misc devices that really don't fit anywhere else. # obj- := misc.o # Dummy rule to force built-in.o to be made -include $(TOPDIR)/Rules.make diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index 7ec5dfbb2501..711370fed5c6 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -40,5 +40,3 @@ obj-$(CONFIG_FTL) += ftl.o obj-$(CONFIG_NFTL) += nftl.o nftl-objs := nftlcore.o nftlmount.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/mtd/chips/Makefile b/drivers/mtd/chips/Makefile index ed074639f968..f33a0191fe08 100644 --- a/drivers/mtd/chips/Makefile +++ b/drivers/mtd/chips/Makefile @@ -25,5 +25,3 @@ obj-$(CONFIG_MTD_RAM) += map_ram.o obj-$(CONFIG_MTD_ROM) += map_rom.o obj-$(CONFIG_MTD_SHARP) += sharp.o obj-$(CONFIG_MTD_ABSENT) += map_absent.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/mtd/devices/Makefile b/drivers/mtd/devices/Makefile index 693666b9ae07..7c68dc858147 100644 --- a/drivers/mtd/devices/Makefile +++ b/drivers/mtd/devices/Makefile @@ -19,5 +19,3 @@ obj-$(CONFIG_MTD_PMC551) += pmc551.o obj-$(CONFIG_MTD_MTDRAM) += mtdram.o obj-$(CONFIG_MTD_LART) += lart.o obj-$(CONFIG_MTD_BLKMTD) += blkmtd.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index 152d46a0e587..3044c7b6a904 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile @@ -37,5 +37,3 @@ obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o obj-$(CONFIG_MTD_EDB7312) += edb7312.o obj-$(CONFIG_MTD_IMPA7) += impa7.o obj-$(CONFIG_MTD_FORTUNET) += fortunet.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index fe95a2c5a745..a9b817e1b7c8 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -10,5 +10,3 @@ nandobjs-$(CONFIG_MTD_NAND_ECC) += nand_ecc.o obj-$(CONFIG_MTD_NAND) += $(nandobjs-y) obj-$(CONFIG_MTD_NAND_SPIA) += spia.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 35c0ce8b2925..11d31e417ac3 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -198,6 +198,3 @@ obj-$(CONFIG_NET_WIRELESS) += wireless/ obj-$(CONFIG_NET_TULIP) += tulip/ obj-$(CONFIG_HAMRADIO) += hamradio/ obj-$(CONFIG_IRDA) += irda/ - -include $(TOPDIR)/Rules.make - diff --git a/drivers/net/appletalk/Makefile b/drivers/net/appletalk/Makefile index 4ef266096b58..a4a35d58bdfe 100644 --- a/drivers/net/appletalk/Makefile +++ b/drivers/net/appletalk/Makefile @@ -7,6 +7,3 @@ export-objs := obj-$(CONFIG_IPDDP) += ipddp.o obj-$(CONFIG_COPS) += cops.o obj-$(CONFIG_LTPC) += ltpc.o - -include $(TOPDIR)/Rules.make - diff --git a/drivers/net/arcnet/Makefile b/drivers/net/arcnet/Makefile index c3da45dd71f4..2ddc8ad8d4df 100644 --- a/drivers/net/arcnet/Makefile +++ b/drivers/net/arcnet/Makefile @@ -13,5 +13,3 @@ obj-$(CONFIG_ARCNET_RIM_I) += arc-rimi.o obj-$(CONFIG_ARCNET_COM20020) += com20020.o obj-$(CONFIG_ARCNET_COM20020_ISA) += com20020-isa.o obj-$(CONFIG_ARCNET_COM20020_PCI) += com20020-pci.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/net/e100/Makefile b/drivers/net/e100/Makefile index 3fef25fabf11..0025b63a3cff 100644 --- a/drivers/net/e100/Makefile +++ b/drivers/net/e100/Makefile @@ -6,5 +6,3 @@ obj-$(CONFIG_E100) += e100.o e100-objs := e100_main.o e100_config.o e100_proc.o e100_phy.o \ e100_eeprom.o e100_test.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile index 24254364ce60..48fd71274674 100644 --- a/drivers/net/e1000/Makefile +++ b/drivers/net/e1000/Makefile @@ -34,5 +34,3 @@ obj-$(CONFIG_E1000) += e1000.o e1000-objs := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o \ e1000_proc.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/net/fc/Makefile b/drivers/net/fc/Makefile index 16c58df620dd..8f31f2e5483d 100644 --- a/drivers/net/fc/Makefile +++ b/drivers/net/fc/Makefile @@ -6,5 +6,3 @@ # obj-$(CONFIG_IPHASE5526) += iph5526.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/net/hamradio/Makefile b/drivers/net/hamradio/Makefile index ccb63d339190..68fce8ce9daa 100644 --- a/drivers/net/hamradio/Makefile +++ b/drivers/net/hamradio/Makefile @@ -22,5 +22,3 @@ obj-$(CONFIG_BAYCOM_SER_FDX) += baycom_ser_fdx.o hdlcdrv.o obj-$(CONFIG_BAYCOM_SER_HDX) += baycom_ser_hdx.o hdlcdrv.o obj-$(CONFIG_BAYCOM_PAR) += baycom_par.o hdlcdrv.o obj-$(CONFIG_BAYCOM_EPP) += baycom_epp.o hdlcdrv.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile index 1af6238fe79d..94e0b522cd81 100644 --- a/drivers/net/irda/Makefile +++ b/drivers/net/irda/Makefile @@ -40,5 +40,3 @@ obj-$(CONFIG_ACTISYS_DONGLE) += actisys-sir.o # The SIR helper module sir-dev-objs := sir_core.o sir_dev.o sir_dongle.o sir_kthread.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile index 7d7795f49092..80393af696ce 100644 --- a/drivers/net/pcmcia/Makefile +++ b/drivers/net/pcmcia/Makefile @@ -21,5 +21,3 @@ obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o obj-$(CONFIG_AIRONET4500_CS) += aironet4500_cs.o obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/net/sk98lin/Makefile b/drivers/net/sk98lin/Makefile index 5a2306393740..b20f7c751d39 100644 --- a/drivers/net/sk98lin/Makefile +++ b/drivers/net/sk98lin/Makefile @@ -56,6 +56,3 @@ endif # SK_DBGCAT_DRV_EVENT 0x08000000 driver events EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_USE_CSUM $(DBGDEF) - -include $(TOPDIR)/Rules.make - diff --git a/drivers/net/skfp/Makefile b/drivers/net/skfp/Makefile index be83ad122d23..6cfccfb7889f 100644 --- a/drivers/net/skfp/Makefile +++ b/drivers/net/skfp/Makefile @@ -18,6 +18,3 @@ skfp-objs := skfddi.o hwmtm.o fplustm.o smt.o cfm.o \ # thus simplify fixes to it), please do not clean it up! EXTRA_CFLAGS += -Idrivers/net/skfp -DPCI -DMEM_MAPPED_IO -Wno-strict-prototypes - -include $(TOPDIR)/Rules.make - diff --git a/drivers/net/tokenring/Makefile b/drivers/net/tokenring/Makefile index fe558b672803..ff1765b8dc18 100644 --- a/drivers/net/tokenring/Makefile +++ b/drivers/net/tokenring/Makefile @@ -14,5 +14,3 @@ obj-$(CONFIG_TMSPCI) += tmspci.o obj-$(CONFIG_TMSISA) += tmsisa.o obj-$(CONFIG_SMCTR) += smctr.o obj-$(CONFIG_3C359) += 3c359.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/net/tulip/Makefile b/drivers/net/tulip/Makefile index 076623ab0266..8bb9b4683979 100644 --- a/drivers/net/tulip/Makefile +++ b/drivers/net/tulip/Makefile @@ -15,5 +15,3 @@ obj-$(CONFIG_DE4X5) += de4x5.o tulip-objs := eeprom.o interrupt.o media.o \ timer.o tulip_core.o \ 21142.o pnic.o pnic2.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile index 8e98428ebbec..998f810b2ba3 100644 --- a/drivers/net/wan/Makefile +++ b/drivers/net/wan/Makefile @@ -68,5 +68,3 @@ ifeq ($(CONFIG_HDLC_PPP),y) endif obj-$(CONFIG_N2) += n2.o obj-$(CONFIG_C101) += c101.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/net/wan/lmc/Makefile b/drivers/net/wan/lmc/Makefile index 4275693aab22..dabdcfed4efd 100644 --- a/drivers/net/wan/lmc/Makefile +++ b/drivers/net/wan/lmc/Makefile @@ -15,6 +15,3 @@ lmc-objs := lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o # -DLMC_PACKET_LOG EXTRA_CFLAGS += -I. $(DBGDEF) - -include $(TOPDIR)/Rules.make - diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 64f6542c26fb..8ff64e712a46 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -18,5 +18,3 @@ obj-$(CONFIG_PCI_HERMES) += orinoco_pci.o obj-$(CONFIG_AIRO) += airo.o obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/nubus/Makefile b/drivers/nubus/Makefile index 2a41129a0c40..65e553e6b18e 100644 --- a/drivers/nubus/Makefile +++ b/drivers/nubus/Makefile @@ -8,5 +8,3 @@ obj-y := nubus.o obj-$(CONFIG_MODULES) += nubus_syms.o obj-$(CONFIG_PROC_FS) += proc.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/parport/Makefile b/drivers/parport/Makefile index f0d3a3b16925..bfd8516fcfb9 100644 --- a/drivers/parport/Makefile +++ b/drivers/parport/Makefile @@ -19,5 +19,3 @@ obj-$(CONFIG_PARPORT_MFC3) += parport_mfc3.o obj-$(CONFIG_PARPORT_ATARI) += parport_atari.o obj-$(CONFIG_PARPORT_SUNBPP) += parport_sunbpp.o obj-$(CONFIG_PARPORT_GSC) += parport_gsc.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 2749c3ccd859..5542f7e5dd15 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -39,8 +39,6 @@ host-progs := gen-devlist # Files generated that shall be removed upon make clean clean-files := devlist.h classlist.h -include $(TOPDIR)/Rules.make - # Dependencies on generated files need to be listed explicitly $(obj)/names.o: $(obj)/devlist.h $(obj)/classlist.h diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 734b5a5cec43..700be62795bf 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -47,5 +47,3 @@ 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) - -include $(TOPDIR)/Rules.make diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile index c23e05dc7b38..de32e032755d 100644 --- a/drivers/pnp/Makefile +++ b/drivers/pnp/Makefile @@ -10,5 +10,3 @@ obj-$(CONFIG_PNPBIOS) += pnpbios/ obj-$(CONFIG_ISAPNP) += isapnp/ export-objs := core.o driver.o resource.o $(pnp-card-y) - -include $(TOPDIR)/Rules.make diff --git a/drivers/pnp/isapnp/Makefile b/drivers/pnp/isapnp/Makefile index 826ad78cb3d1..62c36dd5df7e 100644 --- a/drivers/pnp/isapnp/Makefile +++ b/drivers/pnp/isapnp/Makefile @@ -7,5 +7,3 @@ export-objs := core.o isapnp-proc-$(CONFIG_PROC_FS) = proc.o obj-y := core.o $(isapnp-proc-y) - -include $(TOPDIR)/Rules.make diff --git a/drivers/pnp/pnpbios/Makefile b/drivers/pnp/pnpbios/Makefile index 436880693114..60a06c7831c3 100644 --- a/drivers/pnp/pnpbios/Makefile +++ b/drivers/pnp/pnpbios/Makefile @@ -7,5 +7,3 @@ export-objs := core.o pnpbios-proc-$(CONFIG_PROC_FS) = proc.o obj-y := core.o $(pnpbios-proc-y) - -include $(TOPDIR)/Rules.make diff --git a/drivers/s390/Makefile b/drivers/s390/Makefile index c7d97f7a1755..35394a104755 100644 --- a/drivers/s390/Makefile +++ b/drivers/s390/Makefile @@ -6,6 +6,3 @@ obj-y += s390mach.o sysinfo.o obj-y += cio/ block/ char/ misc/ net/ drivers-y += drivers/s390/built-in.o - -include $(TOPDIR)/Rules.make - diff --git a/drivers/s390/block/Makefile b/drivers/s390/block/Makefile index d4bc9f2b0f1e..8aa452c422d2 100644 --- a/drivers/s390/block/Makefile +++ b/drivers/s390/block/Makefile @@ -15,5 +15,3 @@ obj-$(CONFIG_DASD_DIAG) += dasd_diag_mod.o obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o obj-$(CONFIG_DASD_FBA) += dasd_fba_mod.o obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile index 6eec68d8ecf8..8f79046e0a1a 100644 --- a/drivers/s390/char/Makefile +++ b/drivers/s390/char/Makefile @@ -20,5 +20,3 @@ tape-$(CONFIG_PROC_FS) += tape_proc.o tape-objs := tape_core.o tape_std.o tape_char.o $(tape-y) obj-$(CONFIG_S390_TAPE) += tape.o obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/s390/cio/Makefile b/drivers/s390/cio/Makefile index b6bc8c9a9291..322c767092ab 100644 --- a/drivers/s390/cio/Makefile +++ b/drivers/s390/cio/Makefile @@ -15,5 +15,3 @@ export-objs += ccwgroup.o obj-$(CONFIG_QDIO) += qdio.o export-objs += qdio.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/s390/misc/Makefile b/drivers/s390/misc/Makefile index a2c6f438794b..dff2d8809bb0 100644 --- a/drivers/s390/misc/Makefile +++ b/drivers/s390/misc/Makefile @@ -3,5 +3,3 @@ # # placeholder for stuff to come... - -include $(TOPDIR)/Rules.make diff --git a/drivers/s390/net/Makefile b/drivers/s390/net/Makefile index a19a1a380cbe..692d42c758ba 100644 --- a/drivers/s390/net/Makefile +++ b/drivers/s390/net/Makefile @@ -10,6 +10,3 @@ obj-$(CONFIG_IUCV) += iucv.o fsm.o obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o obj-$(CONFIG_IUCV) += netiucv.o obj-$(CONFIG_LCS) += lcs.o cu3088.o - -include $(TOPDIR)/Rules.make - diff --git a/drivers/sbus/Makefile b/drivers/sbus/Makefile index d259ee9b131f..7b1d24d95308 100644 --- a/drivers/sbus/Makefile +++ b/drivers/sbus/Makefile @@ -7,5 +7,3 @@ obj-y := sbus.o dvma.o endif obj-$(CONFIG_SBUSCHAR) += char/ - -include $(TOPDIR)/Rules.make diff --git a/drivers/sbus/char/Makefile b/drivers/sbus/char/Makefile index ff9187aa7499..52bafc65ff79 100644 --- a/drivers/sbus/char/Makefile +++ b/drivers/sbus/char/Makefile @@ -25,5 +25,3 @@ obj-$(CONFIG_SUN_AURORA) += aurora.o obj-$(CONFIG_TADPOLE_TS102_UCTRL) += uctrl.o obj-$(CONFIG_SUN_JSFLASH) += jsflash.o obj-$(CONFIG_BBC_I2C) += bbc.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 0aa695f1df9d..ddfd46f701fc 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -141,8 +141,6 @@ cpqfc-objs := cpqfcTSinit.o cpqfcTScontrol.o cpqfcTSi2c.o \ clean-files := 53c8xx_d.h 53c7xx_d.h sim710_d.h 53c700_d.h \ 53c8xx_u.h 53c7xx_u.h sim710_u.h 53c700_u.h -include $(TOPDIR)/Rules.make - $(obj)/53c7,8xx.o: $(obj)/53c8xx_d.h $(obj)/53c8xx_u.h $(obj)/53c7xx.o: $(obj)/53c7xx_d.h $(obj)/53c7xx_u.h $(obj)/sim710.o: $(obj)/sim710_d.h diff --git a/drivers/scsi/aacraid/Makefile b/drivers/scsi/aacraid/Makefile index e172532da4e9..7386f5718be6 100644 --- a/drivers/scsi/aacraid/Makefile +++ b/drivers/scsi/aacraid/Makefile @@ -6,5 +6,3 @@ aacraid-objs := linit.o aachba.o commctrl.o comminit.o commsup.o \ dpcsup.o rx.o sa.o EXTRA_CFLAGS := -Idrivers/scsi - -include $(TOPDIR)/Rules.make diff --git a/drivers/scsi/pcmcia/Makefile b/drivers/scsi/pcmcia/Makefile index e189f1a25b87..01785300ee90 100644 --- a/drivers/scsi/pcmcia/Makefile +++ b/drivers/scsi/pcmcia/Makefile @@ -22,5 +22,3 @@ obj-$(CONFIG_PCMCIA_NINJA_SCSI) += nsp_cs.o aha152x_cs-objs := aha152x_stub.o aha152x.o fdomain_cs-objs := fdomain_stub.o fdomain.o qlogic_cs-objs := qlogic_stub.o qlogicfas.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/scsi/sym53c8xx_2/Makefile b/drivers/scsi/sym53c8xx_2/Makefile index 967e133ba9b1..672ca5af4215 100644 --- a/drivers/scsi/sym53c8xx_2/Makefile +++ b/drivers/scsi/sym53c8xx_2/Makefile @@ -2,6 +2,3 @@ sym53c8xx-objs := sym_fw.o sym_glue.o sym_hipd.o sym_malloc.o sym_misc.o sym_nvram.o obj-$(CONFIG_SCSI_SYM53C8XX_2) := sym53c8xx.o - -include $(TOPDIR)/Rules.make - diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 27a1da37eec1..b23d6ef441cd 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -29,5 +29,3 @@ obj-$(CONFIG_SERIAL_68328) += 68328serial.o obj-$(CONFIG_SERIAL_68360) += 68360serial.o obj-$(CONFIG_SERIAL_COLDFIRE) += mcfserial.o obj-$(CONFIG_V850E_NB85E_UART) += nb85e_uart.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/sgi/Makefile b/drivers/sgi/Makefile index 7196ecf2635a..d38b9795366b 100644 --- a/drivers/sgi/Makefile +++ b/drivers/sgi/Makefile @@ -8,5 +8,3 @@ subdir-m += char obj-y += char/ - -include $(TOPDIR)/Rules.make diff --git a/drivers/sgi/char/Makefile b/drivers/sgi/char/Makefile index 90887e077fa8..fe6f41b78136 100644 --- a/drivers/sgi/char/Makefile +++ b/drivers/sgi/char/Makefile @@ -8,5 +8,3 @@ obj-y := newport.o shmiq.o sgicons.o usema.o streamable.o obj-$(CONFIG_SGI_SERIAL) += sgiserial.o obj-$(CONFIG_SGI_DS1286) += ds1286.o obj-$(CONFIG_SGI_NEWPORT_GFX) += graphics.o rrm.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/tc/Makefile b/drivers/tc/Makefile index c7f242db75cc..1c0622fe7c24 100644 --- a/drivers/tc/Makefile +++ b/drivers/tc/Makefile @@ -13,8 +13,6 @@ obj-$(CONFIG_TC) += tc.o obj-$(CONFIG_ZS) += zs.o obj-$(CONFIG_VT) += lk201.o lk201-map.o lk201-remap.o -include $(TOPDIR)/Rules.make - $(obj)/lk201-map.o: $(obj)/lk201-map.c # Uncomment if you're changing the keymap and have an appropriate diff --git a/drivers/telephony/Makefile b/drivers/telephony/Makefile index daf236194204..ae8717c92f5f 100644 --- a/drivers/telephony/Makefile +++ b/drivers/telephony/Makefile @@ -7,6 +7,3 @@ 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 - -include $(TOPDIR)/Rules.make - diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 84682cf5713a..0231b65954e3 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -58,5 +58,3 @@ obj-$(CONFIG_USB_SPEEDTOUCH) += misc/ obj-$(CONFIG_USB_TEST) += 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 8e787e5bbbe4..971e5497a3fd 100644 --- a/drivers/usb/class/Makefile +++ b/drivers/usb/class/Makefile @@ -8,6 +8,3 @@ obj-$(CONFIG_USB_AUDIO) += audio.o obj-$(CONFIG_USB_BLUETOOTH_TTY) += bluetty.o obj-$(CONFIG_USB_MIDI) += usb-midi.o obj-$(CONFIG_USB_PRINTER) += usblp.o - - -include $(TOPDIR)/Rules.make diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile index a3be2618435a..cfeb5c4ba6b5 100644 --- a/drivers/usb/core/Makefile +++ b/drivers/usb/core/Makefile @@ -16,5 +16,3 @@ ifeq ($(CONFIG_USB_DEVICEFS),y) endif obj-$(CONFIG_USB) += usbcore.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 937425c1eafe..b1146b80cc60 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -8,5 +8,3 @@ obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o obj-$(CONFIG_USB_SL811HS) += hc_sl811.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/usb/image/Makefile b/drivers/usb/image/Makefile index 24efb2d2a024..987ffdd8c52f 100644 --- a/drivers/usb/image/Makefile +++ b/drivers/usb/image/Makefile @@ -6,5 +6,3 @@ obj-$(CONFIG_USB_MDC800) += mdc800.o obj-$(CONFIG_USB_HPUSBSCSI) += hpusbscsi.o obj-$(CONFIG_USB_MICROTEK) += microtek.o obj-$(CONFIG_USB_SCANNER) += scanner.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile index 5e324c467793..3e18f02ff5cf 100644 --- a/drivers/usb/input/Makefile +++ b/drivers/usb/input/Makefile @@ -30,5 +30,3 @@ obj-$(CONFIG_USB_MOUSE) += usbmouse.o obj-$(CONFIG_USB_WACOM) += wacom.o obj-$(CONFIG_USB_POWERMATE) += powermate.o obj-$(CONFIG_USB_XPAD) += xpad.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/usb/media/Makefile b/drivers/usb/media/Makefile index d30da815bf8f..674d47aa8393 100644 --- a/drivers/usb/media/Makefile +++ b/drivers/usb/media/Makefile @@ -15,5 +15,3 @@ obj-$(CONFIG_USB_PWC) += pwc.o obj-$(CONFIG_USB_SE401) += se401.o obj-$(CONFIG_USB_STV680) += stv680.o obj-$(CONFIG_USB_VICAM) += vicam.o usbvideo.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile index b22036ea0044..18567cbf915f 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile @@ -14,5 +14,3 @@ obj-$(CONFIG_USB_SPEEDTOUCH) += speedtouch.o atmsar.o obj-$(CONFIG_USB_TEST) += usbtest.o obj-$(CONFIG_USB_TIGL) += tiglusb.o obj-$(CONFIG_USB_USS720) += uss720.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/usb/net/Makefile b/drivers/usb/net/Makefile index bf1fd074c10e..30ff9a53f1d0 100644 --- a/drivers/usb/net/Makefile +++ b/drivers/usb/net/Makefile @@ -8,6 +8,3 @@ obj-$(CONFIG_USB_KAWETH) += kaweth.o obj-$(CONFIG_USB_PEGASUS) += pegasus.o obj-$(CONFIG_USB_RTL8150) += rtl8150.o obj-$(CONFIG_USB_USBNET) += usbnet.o - - -include $(TOPDIR)/Rules.make diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile index 8f52f85f2b34..7ac4907de3a8 100644 --- a/drivers/usb/serial/Makefile +++ b/drivers/usb/serial/Makefile @@ -34,6 +34,3 @@ obj-$(CONFIG_USB_SERIAL_SAFE) += safe_serial.o export-objs := usb-serial.o ezusb.o usbserial-objs := usb-serial.o generic.o bus.o $(usbserial-obj-y) - -include $(TOPDIR)/Rules.make - diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile index aa4132450f10..327e3d788252 100644 --- a/drivers/usb/storage/Makefile +++ b/drivers/usb/storage/Makefile @@ -21,5 +21,3 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT) += jumpshot.o raw_bulk.o usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \ initializers.o $(usb-storage-obj-y) - -include $(TOPDIR)/Rules.make diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 21d7f402a86c..d9767337fe1f 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -88,8 +88,6 @@ obj-$(CONFIG_FB_VOODOO1) += sstfb.o # Files generated that shall be removed upon make clean clean-files := promcon_tbl.c -include $(TOPDIR)/Rules.make - $(obj)/promcon_tbl.c: $(src)/prom.uni $(objtree)/scripts/conmakehash $< | \ sed -e '/#include <[^>]*>/p' -e 's/types/init/' \ diff --git a/drivers/video/aty/Makefile b/drivers/video/aty/Makefile index 26b1ebf749da..2cacd326a83e 100644 --- a/drivers/video/aty/Makefile +++ b/drivers/video/aty/Makefile @@ -4,6 +4,3 @@ atyfb-y := atyfb_base.o mach64_accel.o atyfb-$(CONFIG_FB_ATY_GX) += mach64_gx.o atyfb-$(CONFIG_FB_ATY_CT) += mach64_ct.o mach64_cursor.o atyfb-objs := $(atyfb-y) - -include $(TOPDIR)/Rules.make - diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile index 0e5097734e76..8c43a43cdf34 100644 --- a/drivers/video/console/Makefile +++ b/drivers/video/console/Makefile @@ -52,8 +52,6 @@ obj-$(CONFIG_FBCON_STI) += fbcon-sti.o # Files generated that shall be removed upon make clean clean-files := promcon_tbl.c -include $(TOPDIR)/Rules.make - $(obj)/promcon_tbl.c: $(src)/prom.uni $(objtree)/scripts/conmakehash $< | \ sed -e '/#include <[^>]*>/p' -e 's/types/init/' \ diff --git a/drivers/video/matrox/Makefile b/drivers/video/matrox/Makefile index 05b93858f1cb..f35e9b543532 100644 --- a/drivers/video/matrox/Makefile +++ b/drivers/video/matrox/Makefile @@ -15,6 +15,3 @@ my-obj-$(CONFIG_FB_MATROX_G450) += matroxfb_g450.o matroxfb_crtc2.o obj-$(CONFIG_FB_MATROX) += matroxfb_base.o matroxfb_accel.o matroxfb_DAC1064.o matroxfb_Ti3026.o matroxfb_misc.o $(my-obj-y) obj-$(CONFIG_FB_MATROX_I2C) += i2c-matroxfb.o obj-$(CONFIG_FB_MATROX_MAVEN) += matroxfb_maven.o matroxfb_crtc2.o - -include $(TOPDIR)/Rules.make - diff --git a/drivers/video/riva/Makefile b/drivers/video/riva/Makefile index d7656aacb5cc..249329988203 100644 --- a/drivers/video/riva/Makefile +++ b/drivers/video/riva/Makefile @@ -5,5 +5,3 @@ obj-$(CONFIG_FB_RIVA) += rivafb.o rivafb-objs := fbdev.o riva_hw.o - -include $(TOPDIR)/Rules.make diff --git a/drivers/video/sis/Makefile b/drivers/video/sis/Makefile index c816cec01859..0867e56e3dda 100644 --- a/drivers/video/sis/Makefile +++ b/drivers/video/sis/Makefile @@ -7,7 +7,3 @@ export-objs := sis_main.o obj-$(CONFIG_FB_SIS) += sisfb.o sisfb-objs := sis_main.o sis_accel.o init.o init301.o - -include $(TOPDIR)/Rules.make - - diff --git a/drivers/zorro/Makefile b/drivers/zorro/Makefile index 2131c57fccfa..95135165b893 100644 --- a/drivers/zorro/Makefile +++ b/drivers/zorro/Makefile @@ -12,8 +12,6 @@ host-progs := gen-devlist # Files generated that shall be removed upon make clean clean-files := devlist.h -include $(TOPDIR)/Rules.make - # Dependencies on generated files need to be listed explicitly $(obj)/names.o: $(obj)/devlist.h |