diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-29 03:58:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-29 03:58:24 +0000 |
| commit | 1c5c0c934f91fbce2825acbb849e98781e774c1d (patch) | |
| tree | 12b5ae03516d4103bc070e4579ae1f7f71c27d24 /Makefile | |
| parent | 4fe70c31de87823ac9e804f4795589ba74dc6971 (diff) | |
Merge with 2.1.47. Some more cleanup and module fixes.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 1 -SUBLEVEL = 46 +SUBLEVEL = 47 ARCH = mips @@ -120,7 +120,7 @@ FILESYSTEMS =fs/filesystems.a NETWORKS =net/network.a DRIVERS =drivers/block/block.a \ drivers/char/char.a \ - drivers/pnp/pnp.a + drivers/misc/misc.a LIBS =$(TOPDIR)/lib/lib.a SUBDIRS =kernel drivers mm fs net ipc lib @@ -150,6 +150,10 @@ ifdef CONFIG_SBUS DRIVERS := $(DRIVERS) drivers/sbus/sbus.a endif +ifdef CONFIG_PNP +DRIVERS := $(DRIVERS) drivers/pnp/pnp.a +endif + ifdef CONFIG_SGI DRIVERS := --start-group $(DRIVERS) drivers/sgi/sgi.a --end-group endif @@ -276,7 +280,7 @@ drivers: dummy net: dummy $(MAKE) linuxsubdirs SUBDIRS=net -MODFLAGS = -DMODULE +MODFLAGS += -DMODULE ifdef CONFIG_MODULES ifdef CONFIG_MODVERSIONS MODFLAGS += -DMODVERSIONS -include $(HPATH)/linux/modversions.h |