m68k/UAPI: Move Amiga model/chipset definitions to <asm/bootinfo-amiga.h>

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

2 files changed, 33 insertions, 25 deletions

diff --git a/arch/m68k/include/asm/amigahw.h b/arch/m68k/include/asm/amigahw.h
index 3bef0b2ad945..5ad568110f17 100644
--- a/arch/m68k/include/asm/amigahw.h
+++ b/arch/m68k/include/asm/amigahw.h
@@ -18,26 +18,7 @@
 
 #include <linux/ioport.h>
 
-    /*
-     *  Different Amiga models
-     */
-
-#define AMI_UNKNOWN     (0)
-#define AMI_500         (1)
-#define AMI_500PLUS     (2)
-#define AMI_600         (3)
-#define AMI_1000        (4)
-#define AMI_1200        (5)
-#define AMI_2000        (6)
-#define AMI_2500        (7)
-#define AMI_3000        (8)
-#define AMI_3000T       (9)
-#define AMI_3000PLUS    (10)
-#define AMI_4000        (11)
-#define AMI_4000T       (12)
-#define AMI_CDTV        (13)
-#define AMI_CD32        (14)
-#define AMI_DRACO       (15)
+#include <asm/bootinfo-amiga.h>
 
 
     /*
@@ -46,11 +27,6 @@
 
 extern unsigned long amiga_chipset;
 
-#define CS_STONEAGE     (0)
-#define CS_OCS          (1)
-#define CS_ECS          (2)
-#define CS_AGA          (3)
-
 
     /*
      *  Miscellaneous
diff --git a/arch/m68k/include/uapi/asm/bootinfo-amiga.h b/arch/m68k/include/uapi/asm/bootinfo-amiga.h
index 2c32d671f232..28b6da07874a 100644
--- a/arch/m68k/include/uapi/asm/bootinfo-amiga.h
+++ b/arch/m68k/include/uapi/asm/bootinfo-amiga.h
@@ -22,6 +22,38 @@
 
 
     /*
+     *  Amiga models (BI_AMIGA_MODEL)
+     */
+
+#define AMI_UNKNOWN             0
+#define AMI_500                 1
+#define AMI_500PLUS             2
+#define AMI_600                 3
+#define AMI_1000                4
+#define AMI_1200                5
+#define AMI_2000                6
+#define AMI_2500                7
+#define AMI_3000                8
+#define AMI_3000T               9
+#define AMI_3000PLUS            10
+#define AMI_4000                11
+#define AMI_4000T               12
+#define AMI_CDTV                13
+#define AMI_CD32                14
+#define AMI_DRACO               15
+
+
+    /*
+     *  Amiga chipsets (BI_AMIGA_CHIPSET)
+     */
+
+#define CS_STONEAGE             0
+#define CS_OCS                  1
+#define CS_ECS                  2
+#define CS_AGA                  3
+
+
+    /*
      *  Latest Amiga bootinfo version
      */