fixup! WIP: Match pattern that Gem and File use

rust/kernel/drm/kms.rs

@@ -341,11 +341,7 @@ unsafe impl<T: RcModeObject> AlwaysRefCounted for T {
 /// protected under this single lock. So long as this object is held, it is guaranteed that the lock
 /// is held.
 pub struct ModeConfigGuard<'a, T: KmsDriver> {
-<<<<<<< HEAD
     dev: &'a Device<T>,
-=======
-    pub(crate) dev: &'a Device<T>,
->>>>>>> 46d026eb2cf5a (WIP: Match pattern that Gem and File use)
 }
 
 impl<'a, T: KmsDriver> ModeConfigGuard<'a, T> {