diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-09-03 18:56:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:07 -0400 |
commit | 42a3b4f25af8f8d77feddf27f839fa0628dbff1a (patch) | |
tree | 332370ff3889fabb66a45fb5dcf605b142de77c8 /arch/mips/tx4927 | |
parent | 875d43e72b5bf22161a81de7554f88eccf8a51ae (diff) |
[PATCH] mips: nuke trailing whitespace
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips/tx4927')
-rw-r--r-- | arch/mips/tx4927/common/tx4927_irq_handler.S | 6 | ||||
-rw-r--r-- | arch/mips/tx4927/common/tx4927_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/tx4927/toshiba_rbtx4927/Makefile | 6 | ||||
-rw-r--r-- | arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | 42 | ||||
-rw-r--r-- | arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 2 |
5 files changed, 29 insertions, 29 deletions
diff --git a/arch/mips/tx4927/common/tx4927_irq_handler.S b/arch/mips/tx4927/common/tx4927_irq_handler.S index ca123e28d1ef..dd3ceda9d712 100644 --- a/arch/mips/tx4927/common/tx4927_irq_handler.S +++ b/arch/mips/tx4927/common/tx4927_irq_handler.S | |||
@@ -42,13 +42,13 @@ | |||
42 | CLI | 42 | CLI |
43 | .set at | 43 | .set at |
44 | 44 | ||
45 | mfc0 t0, CP0_CAUSE | 45 | mfc0 t0, CP0_CAUSE |
46 | mfc0 t1, CP0_STATUS | 46 | mfc0 t1, CP0_STATUS |
47 | and t0, t1 | 47 | and t0, t1 |
48 | 48 | ||
49 | andi t1, t0, STATUSF_IP7 /* cpu timer */ | 49 | andi t1, t0, STATUSF_IP7 /* cpu timer */ |
50 | bnez t1, ll_ip7 | 50 | bnez t1, ll_ip7 |
51 | 51 | ||
52 | /* IP6..IP3 multiplexed -- do not use */ | 52 | /* IP6..IP3 multiplexed -- do not use */ |
53 | 53 | ||
54 | andi t1, t0, STATUSF_IP2 /* tx4927 pic */ | 54 | andi t1, t0, STATUSF_IP2 /* tx4927 pic */ |
diff --git a/arch/mips/tx4927/common/tx4927_setup.c b/arch/mips/tx4927/common/tx4927_setup.c index 16bcbdc6d1cc..26d7c53612a8 100644 --- a/arch/mips/tx4927/common/tx4927_setup.c +++ b/arch/mips/tx4927/common/tx4927_setup.c | |||
@@ -152,7 +152,7 @@ dump_cp0(char *key) | |||
152 | print_cp0(key, 16, "CONFIG ", read_c0_config()); | 152 | print_cp0(key, 16, "CONFIG ", read_c0_config()); |
153 | return; | 153 | return; |
154 | } | 154 | } |
155 | 155 | ||
156 | void print_pic(char *key, u32 reg, char *name) | 156 | void print_pic(char *key, u32 reg, char *name) |
157 | { | 157 | { |
158 | printk("%s pic:0x%08x:%s=0x%08x\n", key, reg, name, | 158 | printk("%s pic:0x%08x:%s=0x%08x\n", key, reg, name, |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/Makefile b/arch/mips/tx4927/toshiba_rbtx4927/Makefile index 86ca4cf2d587..c1a377a80a5d 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/Makefile +++ b/arch/mips/tx4927/toshiba_rbtx4927/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | obj-y += toshiba_rbtx4927_prom.o | 1 | obj-y += toshiba_rbtx4927_prom.o |
2 | obj-y += toshiba_rbtx4927_setup.o | 2 | obj-y += toshiba_rbtx4927_setup.o |
3 | obj-y += toshiba_rbtx4927_irq.o | 3 | obj-y += toshiba_rbtx4927_irq.o |
4 | 4 | ||
5 | EXTRA_AFLAGS := $(CFLAGS) | 5 | EXTRA_AFLAGS := $(CFLAGS) |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c index fd5b433f83b7..aee07ff2212a 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | 32 | ||
33 | /* | 33 | /* |
34 | IRQ Device | 34 | IRQ Device |
35 | 00 RBTX4927-ISA/00 | 35 | 00 RBTX4927-ISA/00 |
36 | 01 RBTX4927-ISA/01 PS2/Keyboard | 36 | 01 RBTX4927-ISA/01 PS2/Keyboard |
37 | 02 RBTX4927-ISA/02 Cascade RBTX4927-ISA (irqs 8-15) | 37 | 02 RBTX4927-ISA/02 Cascade RBTX4927-ISA (irqs 8-15) |
@@ -52,15 +52,15 @@ IRQ Device | |||
52 | 16 TX4927-CP0/00 Software 0 | 52 | 16 TX4927-CP0/00 Software 0 |
53 | 17 TX4927-CP0/01 Software 1 | 53 | 17 TX4927-CP0/01 Software 1 |
54 | 18 TX4927-CP0/02 Cascade TX4927-CP0 | 54 | 18 TX4927-CP0/02 Cascade TX4927-CP0 |
55 | 19 TX4927-CP0/03 Multiplexed -- do not use | 55 | 19 TX4927-CP0/03 Multiplexed -- do not use |
56 | 20 TX4927-CP0/04 Multiplexed -- do not use | 56 | 20 TX4927-CP0/04 Multiplexed -- do not use |
57 | 21 TX4927-CP0/05 Multiplexed -- do not use | 57 | 21 TX4927-CP0/05 Multiplexed -- do not use |
58 | 22 TX4927-CP0/06 Multiplexed -- do not use | 58 | 22 TX4927-CP0/06 Multiplexed -- do not use |
59 | 23 TX4927-CP0/07 CPU TIMER | 59 | 23 TX4927-CP0/07 CPU TIMER |
60 | 60 | ||
61 | 24 TX4927-PIC/00 | 61 | 24 TX4927-PIC/00 |
62 | 25 TX4927-PIC/01 | 62 | 25 TX4927-PIC/01 |
63 | 26 TX4927-PIC/02 | 63 | 26 TX4927-PIC/02 |
64 | 27 TX4927-PIC/03 Cascade RBTX4927-IOC | 64 | 27 TX4927-PIC/03 Cascade RBTX4927-IOC |
65 | 28 TX4927-PIC/04 | 65 | 28 TX4927-PIC/04 |
66 | 29 TX4927-PIC/05 RBTX4927 RTL-8019AS ethernet | 66 | 29 TX4927-PIC/05 RBTX4927 RTL-8019AS ethernet |
@@ -80,7 +80,7 @@ IRQ Device | |||
80 | 43 TX4927-PIC/19 | 80 | 43 TX4927-PIC/19 |
81 | 44 TX4927-PIC/20 | 81 | 44 TX4927-PIC/20 |
82 | 45 TX4927-PIC/21 | 82 | 45 TX4927-PIC/21 |
83 | 46 TX4927-PIC/22 TX4927 PCI PCI-ERR | 83 | 46 TX4927-PIC/22 TX4927 PCI PCI-ERR |
84 | 47 TX4927-PIC/23 TX4927 PCI PCI-PMA (not used) | 84 | 47 TX4927-PIC/23 TX4927 PCI PCI-PMA (not used) |
85 | 48 TX4927-PIC/24 | 85 | 48 TX4927-PIC/24 |
86 | 49 TX4927-PIC/25 | 86 | 49 TX4927-PIC/25 |
@@ -100,7 +100,7 @@ IRQ Device | |||
100 | 62 RBTX4927-IOC/06 | 100 | 62 RBTX4927-IOC/06 |
101 | 63 RBTX4927-IOC/07 | 101 | 63 RBTX4927-IOC/07 |
102 | 102 | ||
103 | NOTES: | 103 | NOTES: |
104 | SouthBridge/INTR is mapped to SouthBridge/A=PCI-B/#58 | 104 | SouthBridge/INTR is mapped to SouthBridge/A=PCI-B/#58 |
105 | SouthBridge/ISA/pin=0 no pci irq used by this device | 105 | SouthBridge/ISA/pin=0 no pci irq used by this device |
106 | SouthBridge/IDE/pin=1 no pci irq used by this device, using INTR via ISA IRQ14 | 106 | SouthBridge/IDE/pin=1 no pci irq used by this device, using INTR via ISA IRQ14 |
@@ -175,19 +175,19 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB | |||
175 | static const u32 toshiba_rbtx4927_irq_debug_flag = | 175 | static const u32 toshiba_rbtx4927_irq_debug_flag = |
176 | (TOSHIBA_RBTX4927_IRQ_NONE | TOSHIBA_RBTX4927_IRQ_INFO | | 176 | (TOSHIBA_RBTX4927_IRQ_NONE | TOSHIBA_RBTX4927_IRQ_INFO | |
177 | TOSHIBA_RBTX4927_IRQ_WARN | TOSHIBA_RBTX4927_IRQ_EROR | 177 | TOSHIBA_RBTX4927_IRQ_WARN | TOSHIBA_RBTX4927_IRQ_EROR |
178 | // | TOSHIBA_RBTX4927_IRQ_IOC_INIT | 178 | // | TOSHIBA_RBTX4927_IRQ_IOC_INIT |
179 | // | TOSHIBA_RBTX4927_IRQ_IOC_STARTUP | 179 | // | TOSHIBA_RBTX4927_IRQ_IOC_STARTUP |
180 | // | TOSHIBA_RBTX4927_IRQ_IOC_SHUTDOWN | 180 | // | TOSHIBA_RBTX4927_IRQ_IOC_SHUTDOWN |
181 | // | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE | 181 | // | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE |
182 | // | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE | 182 | // | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE |
183 | // | TOSHIBA_RBTX4927_IRQ_IOC_MASK | 183 | // | TOSHIBA_RBTX4927_IRQ_IOC_MASK |
184 | // | TOSHIBA_RBTX4927_IRQ_IOC_ENDIRQ | 184 | // | TOSHIBA_RBTX4927_IRQ_IOC_ENDIRQ |
185 | // | TOSHIBA_RBTX4927_IRQ_ISA_INIT | 185 | // | TOSHIBA_RBTX4927_IRQ_ISA_INIT |
186 | // | TOSHIBA_RBTX4927_IRQ_ISA_STARTUP | 186 | // | TOSHIBA_RBTX4927_IRQ_ISA_STARTUP |
187 | // | TOSHIBA_RBTX4927_IRQ_ISA_SHUTDOWN | 187 | // | TOSHIBA_RBTX4927_IRQ_ISA_SHUTDOWN |
188 | // | TOSHIBA_RBTX4927_IRQ_ISA_ENABLE | 188 | // | TOSHIBA_RBTX4927_IRQ_ISA_ENABLE |
189 | // | TOSHIBA_RBTX4927_IRQ_ISA_DISABLE | 189 | // | TOSHIBA_RBTX4927_IRQ_ISA_DISABLE |
190 | // | TOSHIBA_RBTX4927_IRQ_ISA_MASK | 190 | // | TOSHIBA_RBTX4927_IRQ_ISA_MASK |
191 | // | TOSHIBA_RBTX4927_IRQ_ISA_ENDIRQ | 191 | // | TOSHIBA_RBTX4927_IRQ_ISA_ENDIRQ |
192 | ); | 192 | ); |
193 | #endif | 193 | #endif |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c index 8724ea3ae04e..fc0720599fd9 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | |||
@@ -395,7 +395,7 @@ static int __init tx4927_pcibios_init(void) | |||
395 | /* enable secondary ide */ | 395 | /* enable secondary ide */ |
396 | v08_43 |= 0x80; | 396 | v08_43 |= 0x80; |
397 | 397 | ||
398 | /* | 398 | /* |
399 | * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!! | 399 | * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!! |
400 | * | 400 | * |
401 | * This line of code is intended to provide the user with a work | 401 | * This line of code is intended to provide the user with a work |