diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-11 19:05:14 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-11 19:05:14 +0100 |
| commit | 1a2ad4fd640be4c8c42ec5549f284108c2eb55d3 (patch) | |
| tree | 0d31faa8dab2538210f89f1dcff6d67ea9275eeb /configs/fedora/generic/arm/armv7 | |
| parent | a308a5e812c347a429bc968b67ea46d476bc4039 (diff) | |
| parent | e18a08842c58c529ffcf0a8bca80776a5e14b3d5 (diff) | |
| download | kernel-1a2ad4fd640be4c8c42ec5549f284108c2eb55d3.tar.gz kernel-1a2ad4fd640be4c8c42ec5549f284108c2eb55d3.tar.xz kernel-1a2ad4fd640be4c8c42ec5549f284108c2eb55d3.zip | |
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedorakernel-5.10.6-350.vanilla.knurd.1.fc33
Diffstat (limited to 'configs/fedora/generic/arm/armv7')
3 files changed, 1 insertions, 2 deletions
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_POWER_RESET_SYSCON b/configs/fedora/generic/arm/armv7/CONFIG_POWER_RESET_SYSCON deleted file mode 100644 index d0db15703..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_POWER_RESET_SYSCON +++ /dev/null @@ -1 +0,0 @@ -CONFIG_POWER_RESET_SYSCON=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_POWER_RESET_SYSCON_POWEROFF b/configs/fedora/generic/arm/armv7/CONFIG_POWER_RESET_SYSCON_POWEROFF deleted file mode 100644 index 5965461f4..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_POWER_RESET_SYSCON_POWEROFF +++ /dev/null @@ -1 +0,0 @@ -CONFIG_POWER_RESET_SYSCON_POWEROFF=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SND_MMP_SOC_SSPA b/configs/fedora/generic/arm/armv7/CONFIG_SND_MMP_SOC_SSPA new file mode 100644 index 000000000..723a7cf19 --- /dev/null +++ b/configs/fedora/generic/arm/armv7/CONFIG_SND_MMP_SOC_SSPA @@ -0,0 +1 @@ +CONFIG_SND_MMP_SOC_SSPA=m |