From d3688982acacc36b423eaa230df4ea99352afe6f Mon Sep 17 00:00:00 2001
From: gatecat <gatecat@ds0.me>
Date: Fri, 12 Feb 2021 11:16:59 +0000
Subject: [PATCH] Fix bad rebase

Signed-off-by: gatecat <gatecat@ds0.me>
---
 common/timing_opt.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/timing_opt.cc b/common/timing_opt.cc
index 5b022dd8..9c601e48 100644
--- a/common/timing_opt.cc
+++ b/common/timing_opt.cc
@@ -59,8 +59,7 @@ template <> struct hash<std::pair<int, NEXTPNR_NAMESPACE_PREFIX BelId>>
         return seed;
     }
 };
-
-#if !(defined(ARCH_GENERIC) || defined(ARCH_GOWIN))
+#if !defined(ARCH_GOWIN)
 template <> struct hash<std::pair<NEXTPNR_NAMESPACE_PREFIX IdString, NEXTPNR_NAMESPACE_PREFIX BelId>>
 {
     std::size_t