diff options
| author | Tom Rini <[email protected]> | 2020-06-30 11:14:41 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-06-30 11:14:41 -0400 |
| commit | 6b3c74428a3faca92701843c954b717e8d186b17 (patch) | |
| tree | 4c62a2a7370ea7eb90e04dabee8e11ca7fcaa755 /scripts | |
| parent | 50c9b0e1ddce280823484579c4ecc1f069e7833b (diff) | |
| parent | 3c4aeaf7dc622a226d0d986fc5e8b989722e5bf4 (diff) | |
Merge branch '2020-06-30-pxa-dm_mmc-migration' into next
- Migrate the PXA MMC driver to driver model.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index bc3ca6e5b5a..747583089b8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1368,7 +1368,6 @@ CONFIG_PRPMC_PCI_ALIAS CONFIG_PSRAM_SCFG CONFIG_PWM CONFIG_PXA_LCD -CONFIG_PXA_MMC_GENERIC CONFIG_PXA_PWR_I2C CONFIG_PXA_STD_I2C CONFIG_PXA_VGA |