phil
diff -u -r1.5 Makefile
--- linux/Makefile 1997/04/11 15:12:34 1.5
+++ linux/Makefile 1997/04/12 13:01:23
@@ -118,7 +118,8 @@
FILESYSTEMS =fs/filesystems.a
NETWORKS =net/network.a
DRIVERS =drivers/block/block.a \
- drivers/char/char.a
+ drivers/char/char.a \
+ drivers/pnp/pnp.a
LIBS =$(TOPDIR)/lib/lib.a
SUBDIRS =kernel drivers mm fs net ipc lib
@@ -142,10 +143,6 @@
ifdef CONFIG_PCI
DRIVERS := $(DRIVERS) drivers/pci/pci.a
-endif
-
-ifdef CONFIG_PNP
-DRIVERS := $(DRIVERS) drivers/pnp/pnp.a
endif
ifdef CONFIG_SBUS
diff -u -r1.2 Makefile
--- linux/drivers/Makefile 1997/04/11 15:12:46 1.2
+++ linux/drivers/Makefile 1997/04/12 13:01:41
@@ -7,17 +7,12 @@
#
# Note 2! The CFLAGS definitions are now in the main makefile...
-SUB_DIRS := block char net #streams
-MOD_SUB_DIRS := $(SUB_DIRS) sbus
+SUB_DIRS := block char net pnp #streams
+MOD_SUB_DIRS := $(SUB_DIRS) sbus pnp
ALL_SUB_DIRS := $(SUB_DIRS) pci scsi sbus sound cdrom isdn pnp
ifdef CONFIG_PCI
SUB_DIRS += pci
-endif
-
-ifdef CONFIG_PNP
-SUB_DIRS += pnp
-MOD_SUB_DIRS += pnp
endif
ifdef CONFIG_SBUS