patch-2.3.26 linux/arch/ppc/kernel/Makefile

Next file: linux/arch/ppc/kernel/apus_setup.c
Previous file: linux/arch/ppc/defconfig
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.25/linux/arch/ppc/kernel/Makefile linux/arch/ppc/kernel/Makefile
@@ -60,15 +60,12 @@
 O_OBJS += i8259.o
 endif
 else
-ifeq ($(CONFIG_APUS),y)
-O_OBJS += apus_setup.o prom.o open_pic.o
-else
-ifneq ($(CONFIG_8xx),y)
 O_OBJS += chrp_setup.o chrp_pci.o chrp_time.o \
 	  pmac_time.o pmac_pci.o pmac_setup.o \
 	  prom.o open_pic.o feature.o \
 	  i8259.o pmac_pic.o indirect_pci.o \
 	  gemini_pci.o gemini_prom.o gemini_setup.o
+
 ifeq ($(CONFIG_NVRAM),y)
 O_OBJS += pmac_support.o
 endif
@@ -83,7 +80,8 @@
 ifeq ($(CONFIG_PMAC), y)
 endif
 
-endif
+ifdef CONFIG_APUS
+O_OBJS += apus_setup.o
 endif
 endif
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)