diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-04-03 22:01:20 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-04-03 22:01:20 +0300 |
| commit | 03b22057e8ed2d1df416c9ae8e6e247e0b87ecc8 (patch) | |
| tree | cd89bdd4053e46ff3cbd67adeffa24310c04e725 /include/linux/mfd/tmio.h | |
| parent | 96083b2e90cddfb688e70630a1dbfdfe5fb0262d (diff) | |
| parent | a71c9a1c779f2499fb2afc0553e543f18aff6edf (diff) | |
| download | linux-03b22057e8ed2d1df416c9ae8e6e247e0b87ecc8.tar.xz | |
Merge tag 'v4.11-rc5' into next
Sync up with mainline to bring in changes to input subsystem merged
through other trees.
Diffstat (limited to 'include/linux/mfd/tmio.h')
| -rw-r--r-- | include/linux/mfd/tmio.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index fba44abd05ba..a1520d88ebf3 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -94,10 +94,8 @@ */ #define TMIO_MMC_HAVE_CMD12_CTRL (1 << 7) -/* - * Some controllers needs to set 1 on SDIO status reserved bits - */ -#define TMIO_MMC_SDIO_STATUS_QUIRK (1 << 8) +/* Controller has some SDIO status bits which must be 1 */ +#define TMIO_MMC_SDIO_STATUS_SETBITS (1 << 8) /* * Some controllers have a 32-bit wide data port register |