fix rebase problem

Author: Folkert de Vries

src/unix/linux_like/linux/mod.rs

@@ -1412,26 +1412,7 @@ s_no_extra_traits! {
         pub offset_to_priv: ::__u32,
         pub hdr: ::tpacket_bd_header_u,
     }
-}
-
-s! {
-    // linux/ptp_clock.h
-    pub struct ptp_sys_offset {
-        pub n_samples: ::c_uint,
-        pub rsv: [::c_uint; 3],
-        pub ts: [ptp_clock_time; 2 * PTP_MAX_SAMPLES as usize + 1],
-    }
-
-    pub struct ptp_pin_desc {
-        pub name: [::c_char; 64],
-        pub index: ::c_uint,
-        pub func: ::c_uint,
-        pub chan: ::c_uint,
-        pub rsv: [::c_uint; 5],
-    }
-}
 
-s_no_extra_traits! {
     // linux/net_tstamp.h
     #[allow(missing_debug_implementations)]
     pub struct sock_txtime {