Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (249 commits)
  powerpc: Fix pte_update for CONFIG_PTE_64BIT and !PTE_ATOMIC_UPDATES
  powerpc: Fix a build problem on ppc32 with new DMA_ATTRs
  ibm_newemac: Add MII mode support to the EMAC RGMII bridge.
  powerpc: Don't spin on sync instruction at boot time
  powerpc: Add VSX load/store alignment exception handler
  powerpc: fix giveup_vsx to save registers correctly
  powerpc: support for latencytop
  powerpc: Remove unnecessary condition when sanity-checking WIMG bits
  powerpc: Add PPC_FEATURE_PSERIES_PERFMON_COMPAT
  powerpc: Add driver for Barrier Synchronization Register
  powerpc: mman.h export fixups
  powerpc/fsl: update crypto node definition and device tree instances
  powerpc/fsl: Refactor device bindings
  powerpc/85xx: Minor fixes for 85xxds and 8536ds board.
  powerpc: Add 82xx/83xx/86xx to 6xx Multiplatform
  powerpc/85xx: publish of device for cds platforms
  powerpc/booke: don't reinitialize time base
  powerpc/86xx: Refactor pic init
  powerpc/CPM: Add i2c pins to dts and board setup
  cpm_uart: Support uart_wait_until_sent()
  ...

1 files changed, 0 insertions, 25 deletions

diff --git a/arch/ppc/platforms/Makefile b/arch/ppc/platforms/Makefile
deleted file mode 100644
index 6260231987cb..000000000000
--- a/arch/ppc/platforms/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-obj-$(CONFIG_PPC_PREP)          += prep_pci.o prep_setup.o
-obj-$(CONFIG_PREP_RESIDUAL)     += residual.o
-obj-$(CONFIG_TQM8260)           += tqm8260_setup.o
-obj-$(CONFIG_CPCI690)           += cpci690.o
-obj-$(CONFIG_EV64260)           += ev64260.o
-obj-$(CONFIG_CHESTNUT)          += chestnut.o
-obj-$(CONFIG_LOPEC)             += lopec.o
-obj-$(CONFIG_KATANA)            += katana.o
-obj-$(CONFIG_HDPU)              += hdpu.o
-obj-$(CONFIG_MVME5100)          += mvme5100.o
-obj-$(CONFIG_PAL4)              += pal4_setup.o pal4_pci.o
-obj-$(CONFIG_POWERPMC250)       += powerpmc250.o
-obj-$(CONFIG_PPLUS)             += pplus.o
-obj-$(CONFIG_PRPMC750)          += prpmc750.o
-obj-$(CONFIG_PRPMC800)          += prpmc800.o
-obj-$(CONFIG_RADSTONE_PPC7D)    += radstone_ppc7d.o
-obj-$(CONFIG_SANDPOINT)         += sandpoint.o
-obj-$(CONFIG_SBC82xx)           += sbc82xx.o
-obj-$(CONFIG_SPRUCE)            += spruce.o
-obj-$(CONFIG_LITE5200)          += lite5200.o
-obj-$(CONFIG_EV64360)           += ev64360.o