Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...

diff --combined arch/powerpc/Kconfig
index 9e08d8a69fdf48a78cc84c671815c9c1356ca3db,7d1a535f9fe7987dcb2ae95f9b85bab859809f83..e0f0a4dbe9ae50f0bc35d4f037623e16f8a78e3e
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -228,9 -228,6 +228,9 @@@ config PPC_OF_PLATFORM_PC
        depends on PPC64 # not supported on 32 bits yet
        default n
  
 +config ARCH_SUPPORTS_DEBUG_PAGEALLOC
 +      def_bool y
 +
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"
@@@ -346,7 -343,7 +346,7 @@@ config PHYP_DUM
        help
          Hypervisor-assisted dump is meant to be a kdump replacement
          offering robustness and speed not possible without system
 -        hypervisor assistence.
 +        hypervisor assistance.
  
          If unsure, say "N"
  
@@@ -775,6 -772,7 +775,7 @@@ config LOWMEM_CAM_NUM_BOO
          Say N here unless you know what you are doing.
  
  config LOWMEM_CAM_NUM
+       depends on FSL_BOOKE
        int "Number of CAMs to use to map low memory" if LOWMEM_CAM_NUM_BOOL
        default 3
  

diff --combined include/linux/fsl_devices.h
index 7ef1caf5026962c4e49ab7c8d3b68430645a60a1,4953709f687ae3b0e8b1ab545bf64fa60ad5893c..f2a78b5e8b5509be63ce810beb661af38f3d9e5b
--- 1/include/linux/fsl_devices.h
--- 2/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@@ -18,7 -18,6 +18,6 @@@
  #define _FSL_DEVICE_H_
  
  #include <linux/types.h>
- #include <linux/phy.h>
  
  /*
   * Some conventions on how we handle peripherals on Freescale chips
@@@ -44,27 -43,6 +43,6 @@@
   *
   */
  
- struct gianfar_platform_data {
-       /* device specific information */
-       u32     device_flags;
-       char    bus_id[BUS_ID_SIZE];
-       phy_interface_t interface;
- };
- 
- struct gianfar_mdio_data {
-       /* board specific information */
-       int     irq[32];
- };
- 
- /* Flags in gianfar_platform_data */
- #define FSL_GIANFAR_BRD_HAS_PHY_INTR  0x00000001 /* set or use a timer */
- #define FSL_GIANFAR_BRD_IS_REDUCED    0x00000002 /* Set if RGMII, RMII */
- 
- struct fsl_i2c_platform_data {
-       /* device specific information */
-       u32     device_flags;
- };
- 
  /* Flags related to I2C device features */
  #define FSL_I2C_DEV_SEPARATE_DFSRR    0x00000001
  #define FSL_I2C_DEV_CLOCK_5200                0x00000002
@@@ -95,15 -73,14 +73,15 @@@ struct fsl_usb2_platform_data 
  #define FSL_USB2_PORT0_ENABLED        0x00000001
  #define FSL_USB2_PORT1_ENABLED        0x00000002
  
 +struct spi_device;
 +
  struct fsl_spi_platform_data {
        u32     initial_spmode; /* initial SPMODE value */
 -      u16     bus_num;
 +      s16     bus_num;
        bool    qe_mode;
        /* board specific information */
        u16     max_chipselect;
 -      void    (*activate_cs)(u8 cs, u8 polarity);
 -      void    (*deactivate_cs)(u8 cs, u8 polarity);
 +      void    (*cs_control)(struct spi_device *spi, bool on);
        u32     sysclk;
  };