Merge pull request #640 from richardg867/master
Actually move the P2B-LS code to non-dev builds
This commit is contained in:
@@ -139,7 +139,7 @@ machine_at_6abx3_init(const machine_t *model)
|
|||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
#if defined(DEV_BRANCH) && defined(USE_I686)
|
|
||||||
int
|
int
|
||||||
machine_at_p2bls_init(const machine_t *model)
|
machine_at_p2bls_init(const machine_t *model)
|
||||||
{
|
{
|
||||||
@@ -192,14 +192,16 @@ machine_at_p2bls_init(const machine_t *model)
|
|||||||
0
|
0
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
#if defined(DEV_BRANCH) && defined(USE_I686)
|
||||||
if (model->cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type == CPU_PENTIUM2)
|
if (model->cpu[cpu_manufacturer].cpus[cpu_effective].cpu_type == CPU_PENTIUM2)
|
||||||
machine_hwm.voltages[0] = 2800; /* set higher VCORE (2.8V) for Klamath */
|
machine_hwm.voltages[0] = 2800; /* set higher VCORE (2.8V) for Klamath */
|
||||||
|
#endif
|
||||||
hwm_set_values(machine_hwm);
|
hwm_set_values(machine_hwm);
|
||||||
device_add(&as99127f_device);
|
device_add(&as99127f_device);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
#if defined(DEV_BRANCH) && defined(USE_I686)
|
||||||
int
|
int
|
||||||
machine_at_borapro_init(const machine_t *model)
|
machine_at_borapro_init(const machine_t *model)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user