Revert "Move MSI MS-4144 into dev branch"
This reverts commit f4fadfe22e
.
This commit is contained in:
@@ -159,7 +159,6 @@ cmake_dependent_option(PAS16 "Pro Audio Spectrum 16"
|
||||
cmake_dependent_option(SIO_DETECT "Super I/O Detection Helper" ON "DEV_BRANCH" OFF)
|
||||
cmake_dependent_option(VGAWONDER "ATI VGA Wonder (ATI-18800)" ON "DEV_BRANCH" OFF)
|
||||
cmake_dependent_option(XL24 "ATI VGA Wonder XL24 (ATI-28800-6)" ON "DEV_BRANCH" OFF)
|
||||
cmake_dependent_option(MS4144 "MSI MS-4144" ON "DEV_BRANCH" OFF)
|
||||
|
||||
# Ditto but for Qt
|
||||
if(QT)
|
||||
|
@@ -536,9 +536,7 @@ extern int machine_at_greenb_init(const machine_t *);
|
||||
extern int machine_at_r418_init(const machine_t *);
|
||||
extern int machine_at_ls486e_init(const machine_t *);
|
||||
extern int machine_at_4dps_init(const machine_t *);
|
||||
#if defined(DEV_BRANCH) && defined(USE_MS4144)
|
||||
extern int machine_at_ms4144_init(const machine_t *);
|
||||
#endif
|
||||
extern int machine_at_4saw2_init(const machine_t *);
|
||||
extern int machine_at_m4li_init(const machine_t *);
|
||||
extern int machine_at_alfredo_init(const machine_t *);
|
||||
|
@@ -40,7 +40,3 @@ endif()
|
||||
if(OPEN_AT)
|
||||
target_compile_definitions(mch PRIVATE USE_OPEN_AT)
|
||||
endif()
|
||||
|
||||
if(MS4144)
|
||||
target_compile_definitions(mch PRIVATE USE_MS4144)
|
||||
endif()
|
@@ -1045,7 +1045,7 @@ machine_at_4dps_init(const machine_t *model)
|
||||
|
||||
return ret;
|
||||
}
|
||||
#if defined(DEV_BRANCH) && defined(USE_MS4144)
|
||||
|
||||
int
|
||||
machine_at_ms4144_init(const machine_t *model)
|
||||
{
|
||||
@@ -1072,7 +1072,7 @@ machine_at_ms4144_init(const machine_t *model)
|
||||
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
machine_at_486sp3c_init(const machine_t *model)
|
||||
{
|
||||
|
@@ -7783,7 +7783,6 @@ const machine_t machines[] = {
|
||||
.snd_device = NULL,
|
||||
.net_device = NULL
|
||||
},
|
||||
#if defined(DEV_BRANCH) && defined(USE_MS4144)
|
||||
/* AMIKEY-2 */
|
||||
{
|
||||
.name = "[SiS 496] MSI MS-4144",
|
||||
@@ -7824,7 +7823,6 @@ const machine_t machines[] = {
|
||||
.snd_device = NULL,
|
||||
.net_device = NULL
|
||||
},
|
||||
#endif
|
||||
/* This has the UMC 88xx on-chip KBC. */
|
||||
{
|
||||
.name = "[UMC 8881] A-Trend ATC-1415",
|
||||
|
Reference in New Issue
Block a user