mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 22:21:42 +00:00
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>
This commit is contained in:
parent
4a973592d6
commit
429dbf53bc
@ -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;
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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>
|
||||
|
@ -47,7 +47,6 @@
|
||||
|
||||
#include <asm/macintosh.h>
|
||||
#include <asm/macints.h>
|
||||
#include <asm/machw.h>
|
||||
#include <asm/mac_via.h>
|
||||
|
||||
#include "scsi.h"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user