diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/cpu/arm7/lpc210x.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/cpu/arm7/lpc210x.cpp')
-rw-r--r-- | src/devices/cpu/arm7/lpc210x.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/devices/cpu/arm7/lpc210x.cpp b/src/devices/cpu/arm7/lpc210x.cpp index d2964589e01..19f21ea7b00 100644 --- a/src/devices/cpu/arm7/lpc210x.cpp +++ b/src/devices/cpu/arm7/lpc210x.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood /*************************************************************************** - NXP (Philips) LPC2103 series + NXP (Phillips) LPC2103 series covering LPC2101, LPC2102, LPC2103* *currently only LPC2103 @@ -276,6 +276,5 @@ void lpc210x_device::write_timer(address_space &space, int timer, int offset, ui -void lpc210x_device::device_add_mconfig(machine_config &config) -{ -} +MACHINE_CONFIG_START(lpc210x_device::device_add_mconfig) +MACHINE_CONFIG_END |