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/mfd/tmio.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/mfd/tmio.h')
| -rw-r--r-- | include/linux/mfd/tmio.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 516d955ab8a1..6b9c5d06690c 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h | |||
| @@ -19,6 +19,13 @@ | |||
| 19 | } while (0) | 19 | } while (0) |
| 20 | 20 | ||
| 21 | /* | 21 | /* |
| 22 | * data for the MMC controller | ||
| 23 | */ | ||
| 24 | struct tmio_mmc_data { | ||
| 25 | const unsigned int hclk; | ||
| 26 | }; | ||
| 27 | |||
| 28 | /* | ||
| 22 | * data for the NAND controller | 29 | * data for the NAND controller |
| 23 | */ | 30 | */ |
| 24 | struct tmio_nand_data { | 31 | struct tmio_nand_data { |