patch-2.1.121 linux/arch/arm/Makefile

• Lines: 48
• Date: Sun Sep 6 10:44:47 1998
• Orig file: v2.1.120/linux/arch/arm/Makefile
• Orig date: Tue Jul 21 00:15:29 1998

diff -u --recursive --new-file v2.1.120/linux/arch/arm/Makefile linux/arch/arm/Makefile
@@ -157,13 +157,17 @@
 CORE_FILES	:= arch/arm/kernel/kernel.o arch/arm/mm/mm.o $(CORE_FILES)
 LIBS		:= arch/arm/lib/lib.a $(LIBS) $(GCCLIB)
 
-BLOCK_DRIVERS	:= arch/arm/drivers/block/block.a
+BLOCK_DRIVERS	:= drivers/block/block.a
 CDROM_DRIVERS	:= drivers/cdrom/cdrom.a
 ifeq ($(CONFIG_FB),y)
 CHAR_DRIVERS	:= arch/arm/drivers/char1/char.a
 else
+ifeq ($(CONFIG_VGA_CONSOLE),y)
+CHAR_DRIVERS	:= arch/arm/drivers/char1/char.a
+else
 CHAR_DRIVERS	:= arch/arm/drivers/char/char.a
 endif
+endif
 MISC_DRIVERS	:= drivers/misc/misc.a
 NET_DRIVERS	:= drivers/net/net.a
 PARIDE_DRIVERS	:= drivers/block/paride/paride.a
@@ -171,6 +175,7 @@
 SCSI_DRIVERS	:= drivers/scsi/scsi.a
 SOUND_DRIVERS	:= drivers/sound/sound.a
 VIDEO_DRIVERS	:= drivers/video/video.a
+PNP_DRIVERS	:= drivers/pnp/pnp.a
 
 ifeq ($(CONFIG_ARCH_ACORN),y)
 BLOCK_DRIVERS	+= drivers/acorn/block/acorn-block.a
@@ -183,6 +188,10 @@
 
 ifeq ($(CONFIG_FB),y)
 DRIVERS		:= $(DRIVERS) $(VIDEO_DRIVERS)
+else
+ifeq ($(CONFIG_VGA_CONSOLE),y)
+DRIVERS		:= $(DRIVERS) $(VIDEO_DRIVERS)
+endif
 endif
 ifeq ($(CONFIG_SCSI),y)
 DRIVERS		:= $(DRIVERS) $(SCSI_DRIVERS)
@@ -198,6 +207,9 @@
 endif
 ifeq ($(CONFIG_PARIDE),y)
 DRIVERS		:= $(DRIVERS) $(PARIDE_DRIVERS)
+endif
+ifdef CONFIG_PNP
+DRIVERS		:= $(DRIVERS) $(PNP_DRIVERS)
 endif
 
 symlinks::