target/generic: fix kernel419 config
This commit is contained in:
parent
ae8fccf6af
commit
4b0ab60da2
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user