From 694f2b47ccd80b4251a56e853bf9a861b5dd705b Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Tue, 15 Nov 2022 21:32:26 -0500
Subject: [PATCH] Fix merge mistake

---
 src/cpu/cpu.c    | 3 ---
 src/floppy/fdd.c | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 2bbc23bb0..02448e374 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -164,9 +164,6 @@ static int cyrix_addr;
 static void    cpu_write(uint16_t addr, uint8_t val, void *priv);
 static uint8_t cpu_read(uint16_t addr, void *priv);
 
-static void    cpu_write(uint16_t addr, uint8_t val, void *priv);
-static uint8_t cpu_read(uint16_t addr, void *priv);
-
 #ifdef ENABLE_CPU_LOG
 int cpu_do_log = ENABLE_CPU_LOG;
 
diff --git a/src/floppy/fdd.c b/src/floppy/fdd.c
index 1e4c052d7..93e96d5eb 100644
--- a/src/floppy/fdd.c
+++ b/src/floppy/fdd.c
@@ -383,14 +383,6 @@ fdd_is_dd(int drive)
     return (drive_types[fdd[drive].type].flags & 0x70) == 0x10;
 }
 
-#if 0
-int
-fdd_is_hd(int drive)
-{
-    return drive_types[fdd[drive].type].flags & FLAG_HOLE1;
-}
-#endif
-
 int
 fdd_is_hd(int drive)
 {