Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge

This commit is contained in:
Paul Mackerras 2009-04-22 13:02:09 +10:00
commit 5bd3ef84d7
1794 changed files with 127770 additions and 67927 deletions

View file

@ -79,6 +79,10 @@ struct fsl_spi_platform_data {
u16 max_chipselect;
void (*cs_control)(struct spi_device *spi, bool on);
u32 sysclk;
/* Legacy hooks, used by mpc52xx_psc_spi driver. */
void (*activate_cs)(u8 cs, u8 polarity);
void (*deactivate_cs)(u8 cs, u8 polarity);
};
struct mpc8xx_pcmcia_ops {