diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /drivers/parport | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'drivers/parport')
| -rw-r--r-- | drivers/parport/Makefile | 20 | ||||
| -rw-r--r-- | drivers/parport/parport_gsc.c | 1 |
2 files changed, 1 insertions, 20 deletions
diff --git a/drivers/parport/Makefile b/drivers/parport/Makefile index f2f7b1d70..db514ff8c 100644 --- a/drivers/parport/Makefile +++ b/drivers/parport/Makefile @@ -9,7 +9,7 @@ # Rewritten to use lists instead of if-statements. # -L_TARGET := parport.a +O_TARGET := driver.o export-objs := init.o parport_pc.o @@ -28,24 +28,6 @@ obj-$(CONFIG_PARPORT_ATARI) += parport_atari.o obj-$(CONFIG_PARPORT_SUNBPP) += parport_sunbpp.o obj-$(CONFIG_PARPORT_GSC) += parport_gsc.o -# Extract lists of the multi-part drivers. -# The 'int-*' lists are the intermediate files used to build the multi's. -multi-y := $(filter $(list-multi), $(obj-y)) -multi-m := $(filter $(list-multi), $(obj-m)) -int-y := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs))) -int-m := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs))) - -# Take multi-part drivers out of obj-y and put components in. -obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y) - -# Translate to Rules.make lists. -L_OBJS := $(filter-out $(export-objs), $(obj-y)) -LX_OBJS := $(filter $(export-objs), $(obj-y)) -M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m))) -MX_OBJS := $(sort $(filter $(export-objs), $(obj-m))) -MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m))) -MIX_OBJS := $(sort $(filter $(export-objs), $(int-m))) - include $(TOPDIR)/Rules.make parport.o: $(parport-objs) diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c index 8e4b177e3..155f8be56 100644 --- a/drivers/parport/parport_gsc.c +++ b/drivers/parport/parport_gsc.c @@ -19,7 +19,6 @@ * Andrea Arcangeli */ -#include <linux/config.h> #include <linux/module.h> #include <linux/init.h> #include <linux/sched.h> |