m68k: machw.h cleanup

Remove some more cruft from machw.h and drop the #include where it isn't
needed.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c
index 2165740786a551f2cb975d0fd359a79366ff08ad..65dd77a742a341c493a64982b16a0ec5de60d445 100644 (file)
--- a/arch/m68k/mac/debug.c
+++ b/arch/m68k/mac/debug.c
@@ -24,7 +24,6 @@
 #define BOOTINFO_COMPAT_1_0
 #include <asm/setup.h>
 #include <asm/bootinfo.h>
-#include <asm/machw.h>
 #include <asm/macints.h>
 
 extern unsigned long mac_videobase;

diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index ecddac4a02b95abc11f80dbff860d2bdaea32fbd..e17b8d56ce041960501094863a27e51873505429 100644 (file)
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -127,7 +127,6 @@
 #include <asm/irq.h>
 #include <asm/traps.h>
 #include <asm/bootinfo.h>
-#include <asm/machw.h>
 #include <asm/macintosh.h>
 #include <asm/mac_via.h>
 #include <asm/mac_psc.h>

diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 43d83e054b8e455888671e3b30b1f4240de501a7..8426501119ca82bf641b3098c4a726d696cc26bb 100644 (file)
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -21,7 +21,6 @@
 #include <linux/init.h>
 
 #include <asm/bootinfo.h>
-#include <asm/machw.h>
 #include <asm/macintosh.h>
 #include <asm/macints.h>
 #include <asm/mac_via.h>

diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index 125404788e8d5da8f2f573daf57fc5b99b99c427..f01d418e64fed5c1fa6c67f9566577d774ec2785 100644 (file)
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -32,7 +32,6 @@
 #include <asm/bootinfo.h>
 #include <asm/macintosh.h>
 #include <asm/macints.h>
-#include <asm/machw.h>
 #include <asm/mac_via.h>
 #include <asm/mac_psc.h>
 

diff --git a/drivers/ide/macide.c b/drivers/ide/macide.c
index 43f97cc1d30e8e7481b423cb60d3973e91d3ac44..3c60064f1d4f757a3bf06193af4267b9b226ca58 100644 (file)
--- a/drivers/ide/macide.c
+++ b/drivers/ide/macide.c
@@ -18,7 +18,6 @@
 #include <linux/delay.h>
 #include <linux/ide.h>
 
-#include <asm/machw.h>
 #include <asm/macintosh.h>
 #include <asm/macints.h>
 #include <asm/mac_baboon.h>

diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c
index 741a93a3eb6197eeae387b8445d63f7964d846b9..62dd1fdafecf4c92954cf279be538d77aa5c4d27 100644 (file)
--- a/drivers/macintosh/via-cuda.c
+++ b/drivers/macintosh/via-cuda.c
@@ -23,7 +23,6 @@
 #else
 #include <asm/macintosh.h>
 #include <asm/macints.h>
-#include <asm/machw.h>
 #include <asm/mac_via.h>
 #endif
 #include <asm/io.h>

diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index 6e6dd17ab572f81bd775293ad907b8024407d2ee..817f37a875c9be194c7b7c08736a98acde8d74cb 100644 (file)
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -33,7 +33,6 @@
 #include <linux/init.h>
 #include <asm/macintosh.h>
 #include <asm/macints.h>
-#include <asm/machw.h>
 #include <asm/mac_via.h>
 #include <asm/system.h>
 

diff --git a/drivers/macintosh/via-maciisi.c b/drivers/macintosh/via-maciisi.c
index 2dc788042707fb6dd6abc78abafc84d678c977cd..4d686c0bdea0f196db01d170a3d287f1e1b6a7d0 100644 (file)
--- a/drivers/macintosh/via-maciisi.c
+++ b/drivers/macintosh/via-maciisi.c
@@ -24,7 +24,6 @@
 #include <linux/interrupt.h>
 #include <asm/macintosh.h>
 #include <asm/macints.h>
-#include <asm/machw.h>
 #include <asm/mac_via.h>
 
 static volatile unsigned char *via;

diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index b64741c95ac429d1d3089c0534bb4ca0975cec59..fb9fa614a0e8e2f1f4ff0792c3b0ec1e476239ff 100644 (file)
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -35,7 +35,6 @@
 
 #include <asm/macintosh.h>
 #include <asm/macints.h>
-#include <asm/machw.h>
 #include <asm/mac_via.h>
 
 #include <asm/pgtable.h>

diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 0248919bc2df47b3ed8aac6dc14384f78b098a66..bf2a1c516293dd413bc78515256034aa79b76fff 100644 (file)
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -47,7 +47,6 @@
 
 #include <asm/macintosh.h>
 #include <asm/macints.h>
-#include <asm/machw.h>
 #include <asm/mac_via.h>
 
 #include "scsi.h"

diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index ee380d5f34107d0713b582b9a29cd6259a327119..3a437f9377798a641738ce7ac84ccddd4035361a 100644 (file)
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -36,7 +36,6 @@
 #include <asm/irq.h>
 #include <asm/macintosh.h>
 #include <asm/io.h>
-#include <asm/machw.h>
 
 /* Common DAC base address for the LC, RBV, Valkyrie, and IIvx */
 #define DAC_BASE 0x50f24000

diff --git a/include/asm-m68k/machw.h b/include/asm-m68k/machw.h
index 35624998291c91059b368f0b813517ef6970fadb..2b4de0c2ce4a0a49c9cb5aec1fc48cea7378e22b 100644 (file)
--- a/include/asm-m68k/machw.h
+++ b/include/asm-m68k/machw.h
@@ -26,28 +26,6 @@
 #include <linux/types.h>
 
 #if 0
-/* Mac SCSI Controller 5380 */
-
-#define        MAC_5380_BAS    (0x50F10000) /* This is definitely wrong!! */
-struct MAC_5380 {
-       u_char  scsi_data;
-       u_char  char_dummy1;
-       u_char  scsi_icr;
-       u_char  char_dummy2;
-       u_char  scsi_mode;
-       u_char  char_dummy3;
-       u_char  scsi_tcr;
-       u_char  char_dummy4;
-       u_char  scsi_idstat;
-       u_char  char_dummy5;
-       u_char  scsi_dmastat;
-       u_char  char_dummy6;
-       u_char  scsi_targrcv;
-       u_char  char_dummy7;
-       u_char  scsi_inircv;
-};
-#define        mac_scsi       ((*(volatile struct MAC_5380 *)MAC_5380_BAS))
-
 /*
 ** SCC Z8530
 */