diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-21 13:56:41 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-21 13:56:41 +0100 |
commit | ccd0739ed784579e263d1192891cbfba3f2960ab (patch) | |
tree | a2579623adbc5eafde989469918513a305c2f9b9 /configs/fedora/generic/arm/armv7 | |
parent | 73eb3f395019e18bda30de69451f5aab01017b87 (diff) | |
parent | 54c12bae3d63b257124c7fc4d9b1f7a4acbfd8f6 (diff) | |
download | kernel-ccd0739ed784579e263d1192891cbfba3f2960ab.tar.gz kernel-ccd0739ed784579e263d1192891cbfba3f2960ab.tar.xz kernel-ccd0739ed784579e263d1192891cbfba3f2960ab.zip |
merge origin
Diffstat (limited to 'configs/fedora/generic/arm/armv7')
-rw-r--r-- | configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM | 1 | ||||
-rw-r--r-- | configs/fedora/generic/arm/armv7/CONFIG_SND_MMP_SOC_SSPA | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM b/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM deleted file mode 100644 index 500e1e796..000000000 --- a/configs/fedora/generic/arm/armv7/CONFIG_MTD_NAND_NANDSIM +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MTD_NAND_NANDSIM=m 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 |