target/generic: fix kernel419 config

This commit is contained in:
CN_SZTL 2020-03-11 00:24:21 +08:00
parent ae8fccf6af
commit 4b0ab60da2
No known key found for this signature in database
GPG Key ID: 6850B6345C862176

View File

@ -6120,8 +6120,5 @@ CONFIG_ZONE_DMA=y
# CONFIG_ZRAM_MEMORY_TRACKING is not set
# CONFIG_ZSMALLOC is not set
# CONFIG_ZX_TDM is not set
<<<<<<< HEAD
=======
# CONFIG_NET_ACT_CTINFO is not set
# CONFIG_RPI_AXIPERF is not set
>>>>>>> 252c766ae3fcf52e1610d534056f17d556ec3c99