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:
  powerpc/fsl-booke: Fix address issue when using relocatable kernels
  powerpc/cpm1: Mark micropatch code/data static and __init
  powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations
  powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)

1 files changed, 0 insertions, 22 deletions

diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c
index ffa111a7e9d4..97ab0a81338a 100644
--- a/drivers/spi/spi_mpc8xxx.c
+++ b/drivers/spi/spi_mpc8xxx.c
@@ -66,28 +66,6 @@ struct mpc8xxx_spi_reg {
         __be32 receive;
 };
 
-/* SPI Parameter RAM */
-struct spi_pram {
-        __be16  rbase;  /* Rx Buffer descriptor base address */
-        __be16  tbase;  /* Tx Buffer descriptor base address */
-        u8      rfcr;   /* Rx function code */
-        u8      tfcr;   /* Tx function code */
-        __be16  mrblr;  /* Max receive buffer length */
-        __be32  rstate; /* Internal */
-        __be32  rdp;    /* Internal */
-        __be16  rbptr;  /* Internal */
-        __be16  rbc;    /* Internal */
-        __be32  rxtmp;  /* Internal */
-        __be32  tstate; /* Internal */
-        __be32  tdp;    /* Internal */
-        __be16  tbptr;  /* Internal */
-        __be16  tbc;    /* Internal */
-        __be32  txtmp;  /* Internal */
-        __be32  res;    /* Tx temp. */
-        __be16  rpbase; /* Relocation pointer (CPM1 only) */
-        __be16  res1;   /* Reserved */
-};
-
 /* SPI Controller mode register definitions */
 #define SPMODE_LOOP             (1 << 30)
 #define SPMODE_CI_INACTIVEHIGH  (1 << 29)