diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-19 13:19:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-19 16:07:12 -0400 |
| commit | e9a1ff9724348408144c7f1c5b5cc26130ba46e5 (patch) | |
| tree | 68b56f117206d121b4a7e567b0209c02283c98e6 /configs/qemu-ppce500_defconfig | |
| parent | b6c50e5831f6ce3800d4b3cf3c7aa35dde8c48d9 (diff) | |
| parent | f76f3e3b44328fe6229650540109af93750fd5f0 (diff) | |
Merge branch 'master' into next
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/qemu-ppce500_defconfig')
| -rw-r--r-- | configs/qemu-ppce500_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig index 7756f5f4ae..f48564c3f5 100644 --- a/configs/qemu-ppce500_defconfig +++ b/configs/qemu-ppce500_defconfig @@ -61,5 +61,4 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_BLK=y CONFIG_ADDR_MAP=y -# CONFIG_BINMAN_FDT is not set CONFIG_PANIC_HANG=y |