diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-06 09:50:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-06 09:50:39 +1100 |
| commit | f8213845b6cdfbdc71b34fe7a3046241f1adcb04 (patch) | |
| tree | 76bf267baa9dba5d57f81baf6f38b8d69bef4ff4 /include | |
| parent | d86560675cfb77a75604390ac5516587c92d541e (diff) | |
| parent | 790af23c32b52d6de5b56325ce62f76d1f4f185f (diff) | |
Merge remote branch 'galak/next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl_devices.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 43fc95d822d5..39fd94681e74 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -74,7 +74,7 @@ struct spi_device; struct fsl_spi_platform_data { u32 initial_spmode; /* initial SPMODE value */ s16 bus_num; - bool qe_mode; + unsigned int flags; /* board specific information */ u16 max_chipselect; void (*cs_control)(struct spi_device *spi, bool on); |