diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-07 14:27:30 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-07 14:27:30 -0500 |
| commit | a3b072cd180c12e8fe0ece9487b9065808327640 (patch) | |
| tree | 62b982041be84748852d77cdf6ca5639ef40858f /include/linux/mmc/tmio.h | |
| parent | 75a1ba5b2c529db60ca49626bcaf0bddf4548438 (diff) | |
| parent | 081cd62a010f97b5bc1d2b0cd123c5abc692b68a (diff) | |
Merge tag 'efi-urgent' into x86/urgent
* Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'include/linux/mmc/tmio.h')
| -rw-r--r-- | include/linux/mmc/tmio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mmc/tmio.h b/include/linux/mmc/tmio.h index a1c1f321e519..84d9053b5dca 100644 --- a/include/linux/mmc/tmio.h +++ b/include/linux/mmc/tmio.h | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #define CTL_SDIO_IRQ_MASK 0x38 | 33 | #define CTL_SDIO_IRQ_MASK 0x38 |
| 34 | #define CTL_DMA_ENABLE 0xd8 | 34 | #define CTL_DMA_ENABLE 0xd8 |
| 35 | #define CTL_RESET_SD 0xe0 | 35 | #define CTL_RESET_SD 0xe0 |
| 36 | #define CTL_VERSION 0xe2 | ||
| 36 | #define CTL_SDIO_REGS 0x100 | 37 | #define CTL_SDIO_REGS 0x100 |
| 37 | #define CTL_CLK_AND_WAIT_CTL 0x138 | 38 | #define CTL_CLK_AND_WAIT_CTL 0x138 |
| 38 | #define CTL_RESET_SDIO 0x1e0 | 39 | #define CTL_RESET_SDIO 0x1e0 |