Commit 92474049 authored by Miguel Ojeda's avatar Miguel Ojeda Committed by Linus Torvalds
Browse files

gpu: nova-core: fix up formatting after merge 

In the merge 260f6f4f ("Merge tag 'drm-next-2025-07-30' of
https://gitlab.freedesktop.org/drm/kernel"

), the formatting in the
conflict resolution doesn't match what `make rustfmt` wants to make it.

Fix it up appropriately.

Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0cdee263

drivers/gpu/nova-core/driver.rs

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



use kernel::{auxiliary, bindings, c_str, device::Core, pci, prelude::*, sync::Arc, sizes::SZ_16M};

use kernel::{auxiliary, bindings, c_str, device::Core, pci, prelude::*, sizes::SZ_16M, sync::Arc};



use crate::gpu::Gpu;