Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 429dbf53bca49b110f1058f0d9417a59115c41b8

Authored by Finn Thain
Committed by Geert Uytterhoeven
1 parent 4a973592d6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 12 changed files with 0 additions and 33 deletions Side-by-side Diff

arch/m68k/mac/debug.c
Diff comments   View file @ 429dbf5
... ... @@ -24,7 +24,6 @@
24 24 #define BOOTINFO_COMPAT_1_0
25 25 #include <asm/setup.h>
26 26 #include <asm/bootinfo.h>
27   -#include <asm/machw.h>
28 27 #include <asm/macints.h>
29 28  
30 29 extern unsigned long mac_videobase;
arch/m68k/mac/macints.c
Diff comments   View file @ 429dbf5
... ... @@ -127,7 +127,6 @@
127 127 #include <asm/irq.h>
128 128 #include <asm/traps.h>
129 129 #include <asm/bootinfo.h>
130   -#include <asm/machw.h>
131 130 #include <asm/macintosh.h>
132 131 #include <asm/mac_via.h>
133 132 #include <asm/mac_psc.h>
... ... @@ -21,7 +21,6 @@
21 21 #include <linux/init.h>
22 22  
23 23 #include <asm/bootinfo.h>
24   -#include <asm/machw.h>
25 24 #include <asm/macintosh.h>
26 25 #include <asm/macints.h>
27 26 #include <asm/mac_via.h>
... ... @@ -32,7 +32,6 @@
32 32 #include <asm/bootinfo.h>
33 33 #include <asm/macintosh.h>
34 34 #include <asm/macints.h>
35   -#include <asm/machw.h>
36 35 #include <asm/mac_via.h>
37 36 #include <asm/mac_psc.h>
38 37  
drivers/ide/macide.c
Diff comments   View file @ 429dbf5
... ... @@ -18,7 +18,6 @@
18 18 #include <linux/delay.h>
19 19 #include <linux/ide.h>
20 20  
21   -#include <asm/machw.h>
22 21 #include <asm/macintosh.h>
23 22 #include <asm/macints.h>
24 23 #include <asm/mac_baboon.h>
drivers/macintosh/via-cuda.c
Diff comments   View file @ 429dbf5
... ... @@ -23,7 +23,6 @@
23 23 #else
24 24 #include <asm/macintosh.h>
25 25 #include <asm/macints.h>
26   -#include <asm/machw.h>
27 26 #include <asm/mac_via.h>
28 27 #endif
29 28 #include <asm/io.h>
drivers/macintosh/via-macii.c
Diff comments   View file @ 429dbf5
... ... @@ -33,7 +33,6 @@
33 33 #include <linux/init.h>
34 34 #include <asm/macintosh.h>
35 35 #include <asm/macints.h>
36   -#include <asm/machw.h>
37 36 #include <asm/mac_via.h>
38 37 #include <asm/system.h>
39 38  
drivers/macintosh/via-maciisi.c
Diff comments   View file @ 429dbf5
... ... @@ -24,7 +24,6 @@
24 24 #include <linux/interrupt.h>
25 25 #include <asm/macintosh.h>
26 26 #include <asm/macints.h>
27   -#include <asm/machw.h>
28 27 #include <asm/mac_via.h>
29 28  
30 29 static volatile unsigned char *via;
drivers/macintosh/via-pmu68k.c
Diff comments   View file @ 429dbf5
... ... @@ -35,7 +35,6 @@
35 35  
36 36 #include <asm/macintosh.h>
37 37 #include <asm/macints.h>
38   -#include <asm/machw.h>
39 38 #include <asm/mac_via.h>
40 39  
41 40 #include <asm/pgtable.h>
drivers/scsi/mac_scsi.c
Diff comments   View file @ 429dbf5
... ... @@ -47,7 +47,6 @@
47 47  
48 48 #include <asm/macintosh.h>
49 49 #include <asm/macints.h>
50   -#include <asm/machw.h>
51 50 #include <asm/mac_via.h>
52 51  
53 52 #include "scsi.h"
drivers/video/macfb.c
Diff comments   View file @ 429dbf5
... ... @@ -36,7 +36,6 @@
36 36 #include <asm/irq.h>
37 37 #include <asm/macintosh.h>
38 38 #include <asm/io.h>
39   -#include <asm/machw.h>
40 39  
41 40 /* Common DAC base address for the LC, RBV, Valkyrie, and IIvx */
42 41 #define DAC_BASE 0x50f24000
include/asm-m68k/machw.h
Diff comments   View file @ 429dbf5
... ... @@ -26,28 +26,6 @@
26 26 #include <linux/types.h>
27 27  
28 28 #if 0
29   -/* Mac SCSI Controller 5380 */
30   -
31   -#define MAC_5380_BAS (0x50F10000) /* This is definitely wrong!! */
32   -struct MAC_5380 {
33   - u_char scsi_data;
34   - u_char char_dummy1;
35   - u_char scsi_icr;
36   - u_char char_dummy2;
37   - u_char scsi_mode;
38   - u_char char_dummy3;
39   - u_char scsi_tcr;
40   - u_char char_dummy4;
41   - u_char scsi_idstat;
42   - u_char char_dummy5;
43   - u_char scsi_dmastat;
44   - u_char char_dummy6;
45   - u_char scsi_targrcv;
46   - u_char char_dummy7;
47   - u_char scsi_inircv;
48   -};
49   -#define mac_scsi ((*(volatile struct MAC_5380 *)MAC_5380_BAS))
50   -
51 29 /*
52 30 ** SCC Z8530
53 31 */