From b66058b17f8b0ad47605e598d21acd3644258b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20=C5=9Eiar=20Baysal?= Date: Fri, 8 Nov 2024 11:19:07 +0100 Subject: [PATCH] try to resolve conflicts --- src/kernel.h | 8 ++++---- src/minidexed.cpp | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/kernel.h b/src/kernel.h index 3d9d70b..8167c61 100644 --- a/src/kernel.h +++ b/src/kernel.h @@ -51,12 +51,12 @@ private: private: // do not change this order - CConfig m_Config; + CConfig m_Config; CCPUThrottle m_CPUThrottle; CGPIOManager m_GPIOManager; - CI2CMaster m_I2CMaster; - CMiniDexed *m_pDexed; - CUSBController *m_pUSB; + CI2CMaster m_I2CMaster; + CMiniDexed *m_pDexed; + CUSBController *m_pUSB; static CKernel *s_pThis; }; diff --git a/src/minidexed.cpp b/src/minidexed.cpp index ac3b79a..aa014df 100644 --- a/src/minidexed.cpp +++ b/src/minidexed.cpp @@ -60,7 +60,6 @@ CMiniDexed::CMiniDexed (CConfig *pConfig, CInterruptSystem *pInterrupt, m_bSetNewPerformance (false), m_bDeletePerformance (false), m_bLoadPerformanceBusy(false), - m_pNet(nullptr), m_pNetDevice(nullptr), m_WLAN(WLANFirmwarePath),