diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:22:08 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 21:22:08 -0400 |
| commit | b71a107c66ad952c9d35ec046a803efc89a80556 (patch) | |
| tree | eb1f77af4f14974ba40a413d7679b3a451295a3d /include/linux | |
| parent | 4b337c5f245b6587ba844ac7bb13c313a2912f7b (diff) | |
| parent | e7c5a4f292e0d1f4ba9a3a94b2c8e8b71e35b25a (diff) | |
Merge commit 'gcl/merge' into next
Manual merge of:
drivers/net/fec_mpc52xx.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fsl_devices.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 244677cc082b..43fc95d822d5 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h | |||
| @@ -79,10 +79,6 @@ struct fsl_spi_platform_data { | |||
| 79 | u16 max_chipselect; | 79 | u16 max_chipselect; |
| 80 | void (*cs_control)(struct spi_device *spi, bool on); | 80 | void (*cs_control)(struct spi_device *spi, bool on); |
| 81 | u32 sysclk; | 81 | u32 sysclk; |
| 82 | |||
| 83 | /* Legacy hooks, used by mpc52xx_psc_spi driver. */ | ||
| 84 | void (*activate_cs)(u8 cs, u8 polarity); | ||
| 85 | void (*deactivate_cs)(u8 cs, u8 polarity); | ||
| 86 | }; | 82 | }; |
| 87 | 83 | ||
| 88 | struct mpc8xx_pcmcia_ops { | 84 | struct mpc8xx_pcmcia_ops { |