diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /Makefile | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 13 insertions, 5 deletions
@@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 3 -SUBLEVEL = 27 +SUBLEVEL = 32 EXTRAVERSION = ARCH = mips @@ -113,10 +113,19 @@ NETWORKS =net/network.a DRIVERS =drivers/block/block.a \ drivers/char/char.o \ drivers/misc/misc.o \ + drivers/net/net.o \ drivers/parport/parport.a LIBS =$(TOPDIR)/lib/lib.a SUBDIRS =kernel drivers mm fs net ipc lib +ifdef CONFIG_DRM +DRIVERS += drivers/char/drm/drm.o +endif + +ifeq ($(CONFIG_AGP),y) +DRIVERS += drivers/char/agp/agp.o +endif + ifdef CONFIG_NUBUS DRIVERS := $(DRIVERS) drivers/nubus/nubus.a endif @@ -125,8 +134,6 @@ ifeq ($(CONFIG_ISDN),y) DRIVERS := $(DRIVERS) drivers/isdn/isdn.a endif -DRIVERS := $(DRIVERS) drivers/net/net.a - ifdef CONFIG_NET_FC DRIVERS := $(DRIVERS) drivers/net/fc/fc.a endif @@ -200,7 +207,7 @@ DRIVERS := $(DRIVERS) drivers/sgi/sgi.a endif ifdef CONFIG_VT -DRIVERS := $(DRIVERS) drivers/video/video.a +DRIVERS := $(DRIVERS) drivers/video/video.o endif ifeq ($(CONFIG_PARIDE),y) @@ -365,6 +372,7 @@ modules_install: if [ -f VIDEO_MODULES ]; then inst_mod VIDEO_MODULES video; fi; \ if [ -f FC4_MODULES ]; then inst_mod FC4_MODULES fc4; fi; \ if [ -f IRDA_MODULES ]; then inst_mod IRDA_MODULES net; fi; \ + if [ -f SK98LIN_MODULES ]; then inst_mod SK98LIN_MODULES net; fi; \ if [ -f USB_MODULES ]; then inst_mod USB_MODULES usb; fi; \ if [ -f PCMCIA_MODULES ]; then inst_mod PCMCIA_MODULES pcmcia; fi; \ if [ -f PCMCIA_NET_MODULES ]; then inst_mod PCMCIA_NET_MODULES pcmcia; fi; \ @@ -397,7 +405,7 @@ clean: archclean rm -f .tmp* rm -f drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c rm -f drivers/char/conmakehash - rm -f drivers/pci/devlist.h drivers/pci/gen-devlist + rm -f drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist rm -f drivers/sound/bin2hex drivers/sound/hex2hex rm -f net/khttpd/make_times_h rm -f net/khttpd/times.h |