From: Paul Mackerras <paulus@samba.org>
Date: Tue, 7 Apr 2009 02:54:08 +0000 (+1000)
Subject: Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc... 
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ae6e59caefd8d4097ccb096c95df95ec7e52fe88;hp=-c;p=linux-2.6-omap-h63xx.git

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

ae6e59caefd8d4097ccb096c95df95ec7e52fe88
diff --combined arch/powerpc/Kconfig
index 9e08d8a69fd,7d1a535f9fe..e0f0a4dbe9a
--- a/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 7ef1caf5026,4953709f687..f2a78b5e8b5
--- a/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;
  };