aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/ide-probe.c6
-rw-r--r--drivers/isdn/hisax/avm_pci.c8
-rw-r--r--drivers/scsi/a2091.c3
-rw-r--r--drivers/scsi/a3000.c3
-rw-r--r--drivers/scsi/gvp11.c3
-rw-r--r--drivers/video/console/fbcon.c2
-rw-r--r--drivers/video/console/fonts.c4
7 files changed, 9 insertions, 20 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index fd0ef8268950..6daea896c5db 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1049,7 +1049,7 @@ static int init_irq (ide_hwif_t *hwif)
1049 */ 1049 */
1050 if (!match || match->irq != hwif->irq) { 1050 if (!match || match->irq != hwif->irq) {
1051 int sa = 0; 1051 int sa = 0;
1052#if defined(__mc68000__) || defined(CONFIG_APUS) 1052#if defined(__mc68000__)
1053 sa = IRQF_SHARED; 1053 sa = IRQF_SHARED;
1054#endif /* __mc68000__ || CONFIG_APUS */ 1054#endif /* __mc68000__ || CONFIG_APUS */
1055 1055
@@ -1072,7 +1072,7 @@ static int init_irq (ide_hwif_t *hwif)
1072 hwif->rqsize = 65536; 1072 hwif->rqsize = 65536;
1073 } 1073 }
1074 1074
1075#if !defined(__mc68000__) && !defined(CONFIG_APUS) 1075#if !defined(__mc68000__)
1076 printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name, 1076 printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name,
1077 hwif->io_ports[IDE_DATA_OFFSET], 1077 hwif->io_ports[IDE_DATA_OFFSET],
1078 hwif->io_ports[IDE_DATA_OFFSET]+7, 1078 hwif->io_ports[IDE_DATA_OFFSET]+7,
@@ -1080,7 +1080,7 @@ static int init_irq (ide_hwif_t *hwif)
1080#else 1080#else
1081 printk("%s at 0x%08lx on irq %d", hwif->name, 1081 printk("%s at 0x%08lx on irq %d", hwif->name,
1082 hwif->io_ports[IDE_DATA_OFFSET], hwif->irq); 1082 hwif->io_ports[IDE_DATA_OFFSET], hwif->irq);
1083#endif /* __mc68000__ && CONFIG_APUS */ 1083#endif /* __mc68000__ */
1084 if (match) 1084 if (match)
1085 printk(" (%sed with %s)", 1085 printk(" (%sed with %s)",
1086 hwif->sharing_irq ? "shar" : "serializ", match->name); 1086 hwif->sharing_irq ? "shar" : "serializ", match->name);
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c
index 035d158779df..0f1db1f669b2 100644
--- a/drivers/isdn/hisax/avm_pci.c
+++ b/drivers/isdn/hisax/avm_pci.c
@@ -263,11 +263,7 @@ hdlc_empty_fifo(struct BCState *bcs, int count)
263 outl(idx, cs->hw.avm.cfg_reg + 4); 263 outl(idx, cs->hw.avm.cfg_reg + 4);
264 while (cnt < count) { 264 while (cnt < count) {
265#ifdef __powerpc__ 265#ifdef __powerpc__
266#ifdef CONFIG_APUS
267 *ptr++ = in_le32((unsigned *)(cs->hw.avm.isac +_IO_BASE));
268#else
269 *ptr++ = in_be32((unsigned *)(cs->hw.avm.isac +_IO_BASE)); 266 *ptr++ = in_be32((unsigned *)(cs->hw.avm.isac +_IO_BASE));
270#endif /* CONFIG_APUS */
271#else 267#else
272 *ptr++ = inl(cs->hw.avm.isac); 268 *ptr++ = inl(cs->hw.avm.isac);
273#endif /* __powerpc__ */ 269#endif /* __powerpc__ */
@@ -328,11 +324,7 @@ hdlc_fill_fifo(struct BCState *bcs)
328 if (cs->subtyp == AVM_FRITZ_PCI) { 324 if (cs->subtyp == AVM_FRITZ_PCI) {
329 while (cnt<count) { 325 while (cnt<count) {
330#ifdef __powerpc__ 326#ifdef __powerpc__
331#ifdef CONFIG_APUS
332 out_le32((unsigned *)(cs->hw.avm.isac +_IO_BASE), *ptr++);
333#else
334 out_be32((unsigned *)(cs->hw.avm.isac +_IO_BASE), *ptr++); 327 out_be32((unsigned *)(cs->hw.avm.isac +_IO_BASE), *ptr++);
335#endif /* CONFIG_APUS */
336#else 328#else
337 outl(*ptr++, cs->hw.avm.isac); 329 outl(*ptr++, cs->hw.avm.isac);
338#endif /* __powerpc__ */ 330#endif /* __powerpc__ */
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 23f27c9c9895..5ac3a3e8dfaf 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -46,8 +46,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
46 struct Scsi_Host *instance = cmd->device->host; 46 struct Scsi_Host *instance = cmd->device->host;
47 47
48 /* don't allow DMA if the physical address is bad */ 48 /* don't allow DMA if the physical address is bad */
49 if (addr & A2091_XFER_MASK || 49 if (addr & A2091_XFER_MASK)
50 (!dir_in && mm_end_of_chunk (addr, cmd->SCp.this_residual)))
51 { 50 {
52 HDATA(instance)->dma_bounce_len = (cmd->SCp.this_residual + 511) 51 HDATA(instance)->dma_bounce_len = (cmd->SCp.this_residual + 511)
53 & ~0x1ff; 52 & ~0x1ff;
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index d7255c8bf281..3aeec963940b 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -54,8 +54,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
54 * end of a physical memory chunk, then allocate a bounce 54 * end of a physical memory chunk, then allocate a bounce
55 * buffer 55 * buffer
56 */ 56 */
57 if (addr & A3000_XFER_MASK || 57 if (addr & A3000_XFER_MASK)
58 (!dir_in && mm_end_of_chunk (addr, cmd->SCp.this_residual)))
59 { 58 {
60 HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511) 59 HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511)
61 & ~0x1ff; 60 & ~0x1ff;
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 37741e9b5c3b..91f85226d08f 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -54,8 +54,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
54 static int scsi_alloc_out_of_range = 0; 54 static int scsi_alloc_out_of_range = 0;
55 55
56 /* use bounce buffer if the physical address is bad */ 56 /* use bounce buffer if the physical address is bad */
57 if (addr & HDATA(cmd->device->host)->dma_xfer_mask || 57 if (addr & HDATA(cmd->device->host)->dma_xfer_mask)
58 (!dir_in && mm_end_of_chunk (addr, cmd->SCp.this_residual)))
59 { 58 {
60 HDATA(cmd->device->host)->dma_bounce_len = (cmd->SCp.this_residual + 511) 59 HDATA(cmd->device->host)->dma_bounce_len = (cmd->SCp.this_residual + 511)
61 & ~0x1ff; 60 & ~0x1ff;
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 0f32f4a00b2d..2cedb4991d49 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -84,7 +84,7 @@
84#ifdef CONFIG_MAC 84#ifdef CONFIG_MAC
85#include <asm/macints.h> 85#include <asm/macints.h>
86#endif 86#endif
87#if defined(__mc68000__) || defined(CONFIG_APUS) 87#if defined(__mc68000__)
88#include <asm/machdep.h> 88#include <asm/machdep.h>
89#include <asm/setup.h> 89#include <asm/setup.h>
90#endif 90#endif
diff --git a/drivers/video/console/fonts.c b/drivers/video/console/fonts.c
index 96979c377518..d0c03fd70871 100644
--- a/drivers/video/console/fonts.c
+++ b/drivers/video/console/fonts.c
@@ -15,7 +15,7 @@
15#include <linux/module.h> 15#include <linux/module.h>
16#include <linux/types.h> 16#include <linux/types.h>
17#include <linux/string.h> 17#include <linux/string.h>
18#if defined(__mc68000__) || defined(CONFIG_APUS) 18#if defined(__mc68000__)
19#include <asm/setup.h> 19#include <asm/setup.h>
20#endif 20#endif
21#include <linux/font.h> 21#include <linux/font.h>
@@ -120,7 +120,7 @@ const struct font_desc *get_default_font(int xres, int yres, u32 font_w,
120 for(i=0; i<num_fonts; i++) { 120 for(i=0; i<num_fonts; i++) {
121 f = fonts[i]; 121 f = fonts[i];
122 c = f->pref; 122 c = f->pref;
123#if defined(__mc68000__) || defined(CONFIG_APUS) 123#if defined(__mc68000__)
124#ifdef CONFIG_FONT_PEARL_8x8 124#ifdef CONFIG_FONT_PEARL_8x8
125 if (MACH_IS_AMIGA && f->idx == PEARL8x8_IDX) 125 if (MACH_IS_AMIGA && f->idx == PEARL8x8_IDX)
126 c = 100; 126 c = 100;