VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git] / arch / ppc / syslib / Makefile
index f77cdf1..4de92f4 100644 (file)
@@ -2,13 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-ifdef CONFIG_PPC64BRIDGE
-EXTRA_AFLAGS           := -Wa,-mppc64bridge
-endif
-ifdef CONFIG_4xx
-EXTRA_AFLAGS           := -Wa,-m405
-endif
-
 CFLAGS_prom_init.o      += -fPIC
 CFLAGS_btext.o          += -fPIC
 
@@ -22,7 +15,8 @@ ifeq ($(CONFIG_4xx),y)
 obj-$(CONFIG_4xx)              += ppc4xx_pic.o
 obj-$(CONFIG_40x)              += ppc4xx_setup.o
 obj-$(CONFIG_GEN_RTC)          += todc_time.o
-obj-$(CONFIG_KGDB)             += ppc4xx_kgdb.o
+obj-$(CONFIG_PPC4xx_DMA)       += ppc4xx_dma.o
+obj-$(CONFIG_PPC4xx_EDMA)      += ppc4xx_sgdma.o
 ifeq ($(CONFIG_40x),y)
 obj-$(CONFIG_KGDB)             += ppc4xx_kgdb.o
 obj-$(CONFIG_PCI)              += indirect_pci.o pci_auto.o ppc405_pci.o
@@ -45,7 +39,7 @@ obj-$(CONFIG_EV64260)         += gt64260_common.o gt64260_pic.o \
 obj-$(CONFIG_GEMINI)           += open_pic.o indirect_pci.o
 obj-$(CONFIG_K2)               += i8259.o indirect_pci.o todc_time.o \
                                        pci_auto.o
-obj-$(CONFIG_LOPEC)            += pci_auto.o open_pic.o i8259.o todc_time.o
+obj-$(CONFIG_LOPEC)            += i8259.o pci_auto.o todc_time.o
 obj-$(CONFIG_MCPN765)          += todc_time.o indirect_pci.o pci_auto.o \
                                        open_pic.o i8259.o hawk_common.o
 obj-$(CONFIG_MENF1)            += todc_time.o i8259.o mpc10x_common.o \
@@ -55,23 +49,32 @@ obj-$(CONFIG_MVME5100)              += open_pic.o todc_time.o indirect_pci.o \
 obj-$(CONFIG_OCOTEA)           += indirect_pci.o pci_auto.o todc_time.o
 obj-$(CONFIG_PAL4)             += cpc700_pic.o
 obj-$(CONFIG_PCORE)            += todc_time.o i8259.o pci_auto.o
-obj-$(CONFIG_POWERPMC250)      += open_pic.o pci_auto.o
+obj-$(CONFIG_POWERPMC250)      += pci_auto.o
 obj-$(CONFIG_PPLUS)            += hawk_common.o open_pic.o i8259.o \
                                   indirect_pci.o todc_time.o pci_auto.o
 obj-$(CONFIG_PRPMC750)         += open_pic.o indirect_pci.o pci_auto.o \
                                        hawk_common.o
 obj-$(CONFIG_HARRIER)          += harrier.o
 obj-$(CONFIG_PRPMC800)         += open_pic.o indirect_pci.o pci_auto.o
-obj-$(CONFIG_SANDPOINT)                += i8259.o open_pic.o pci_auto.o todc_time.o
+obj-$(CONFIG_SANDPOINT)                += i8259.o pci_auto.o todc_time.o
 obj-$(CONFIG_SBC82xx)          += todc_time.o
 obj-$(CONFIG_SPRUCE)           += cpc700_pic.o indirect_pci.o pci_auto.o \
                                   todc_time.o
-obj-$(CONFIG_8260)             += m8260_setup.o ppc8260_pic.o
+obj-$(CONFIG_8260)             += m8260_setup.o
+obj-$(CONFIG_PCI_8260)         += m8260_pci.o indirect_pci.o
+obj-$(CONFIG_8260_PCI9)                += m8260_pci_erratum9.o
+obj-$(CONFIG_CPM2)             += cpm2_common.o cpm2_pic.o
 ifeq ($(CONFIG_PPC_GEN550),y)
 obj-$(CONFIG_KGDB)             += gen550_kgdb.o gen550_dbg.o
 obj-$(CONFIG_SERIAL_TEXT_DEBUG)        += gen550_dbg.o
 endif
 obj-$(CONFIG_BOOTX_TEXT)       += btext.o
 obj-$(CONFIG_MPC10X_BRIDGE)     += mpc10x_common.o indirect_pci.o
+obj-$(CONFIG_MPC10X_OPENPIC)   += open_pic.o
 obj-$(CONFIG_40x)              += dcr.o
 obj-$(CONFIG_BOOKE)            += dcr.o
+obj-$(CONFIG_85xx)             += open_pic.o ppc85xx_common.o ppc85xx_setup.o
+ifeq ($(CONFIG_85xx),y)
+obj-$(CONFIG_PCI)              += indirect_pci.o pci_auto.o
+endif
+obj-$(CONFIG_PPC_MPC52xx)      += mpc52xx_setup.o mpc52xx_pic.o