patch 8.2.2054: Amiga: FEAT_ARP defined when it should not

Problem:    Amiga: FEAT_ARP defined when it should not.
Solution:   Adjust "||" to "&&" in #ifdef. (Ola Söder, closes #7375)
diff --git a/src/feature.h b/src/feature.h
index 028eebc..8f7322b 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1090,7 +1090,7 @@
  * +ARP			Amiga only. Use arp.library, DOS 2.0 is not required.
  */
 #if defined(AMIGA) && !defined(NO_ARP) && !defined(__amigaos4__) \
-	&& !defined(__MORPHOS__) || !defined(__AROS__)
+	&& !defined(__MORPHOS__) && !defined(__AROS__)
 # define FEAT_ARP
 #endif
 
diff --git a/src/version.c b/src/version.c
index bd8abac..7b7bea9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2054,
+/**/
     2053,
 /**/
     2052,