aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2005-01-31 18:04:10 +0000
committerH. Peter Anvin <hpa@zytor.com>2005-01-31 18:04:10 +0000
commit22cde118ec4afd3f283a2b5bbf638f0403ed5694 (patch)
tree2758f63c571014d84898e0f738c23e310993102e
parenta428893532b71e22888d3cdbda19ee00eea45fb0 (diff)
downloadabc80-22cde118ec4afd3f283a2b5bbf638f0403ed5694.tar.gz
abc80-22cde118ec4afd3f283a2b5bbf638f0403ed5694.tar.xz
abc80-22cde118ec4afd3f283a2b5bbf638f0403ed5694.zip
Fix merging bug
-rwxr-xr-xabc80.qpf2
-rw-r--r--abc80.v2
2 files changed, 2 insertions, 2 deletions
diff --git a/abc80.qpf b/abc80.qpf
index ae6b944..4f2bf37 100755
--- a/abc80.qpf
+++ b/abc80.qpf
@@ -21,7 +21,7 @@
QUARTUS_VERSION = "4.1"
-DATE = "18:47:23 January 30, 2005"
+DATE = "10:03:50 January 31, 2005"
# Revisions
diff --git a/abc80.v b/abc80.v
index 5822914..6f434af 100644
--- a/abc80.v
+++ b/abc80.v
@@ -874,7 +874,7 @@ module abc80 (
sound_generator sound_generator (
.clk_fast(fast_clk),
.clk_25MHz(video_clk),
- .clk_16us(ctr_16us),
+ .ctr_16us(ctr_16us),
.mixer_ctl({sound[5], sound[3], sound[4]}),
.vco_sel(sound[2]),