diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/linux/fsl_devices.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/linux/fsl_devices.h')
| -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 { |