diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /drivers/acorn | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'drivers/acorn')
| -rw-r--r-- | drivers/acorn/block/Makefile | 3 | ||||
| -rw-r--r-- | drivers/acorn/scsi/Makefile | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/acorn/block/Makefile b/drivers/acorn/block/Makefile index 481d7f328..b52bc245f 100644 --- a/drivers/acorn/block/Makefile +++ b/drivers/acorn/block/Makefile @@ -51,9 +51,6 @@ MX_OBJS := $(sort $(filter $(export-objs), $(obj-m))) include $(TOPDIR)/Rules.make -.S.o: - $(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c -o $*.o $< - fd1772_mod.o: $(FLOPPY) $(LD) -r -o $@ $(FLOPPY) diff --git a/drivers/acorn/scsi/Makefile b/drivers/acorn/scsi/Makefile index a2c94a0d5..35bc69a18 100644 --- a/drivers/acorn/scsi/Makefile +++ b/drivers/acorn/scsi/Makefile @@ -49,8 +49,5 @@ MX_OBJS := $(sort $(filter $(export-objs), $(obj-m))) include $(TOPDIR)/Rules.make -.S.o: - $(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c -o $*.o $< - acornscsi_mod.o: acornscsi.o acornscsi-io.o $(LD) $(LD_RFLAG) -r -o $@ acornscsi.o acornscsi-io.o |