Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2004-02-13 19:52:16 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-02-13 19:52:16 -0800
commit17042cbd66f626e9f39aa366ba1ea59dfa457d76 (patch)
tree3fa7917a4da866dd1c5f74ee636eca5e53529524
parentf912acbe3dcc2680b17c9063fa7c66e377453ef4 (diff)
parent415dd9193de86b7bcd71897e03f514d74590e5ae (diff)
Merge ppc970:v2.5/linux into home.osdl.org:/home/torvalds/v2.5/linux
-rw-r--r--drivers/scsi/libata-core.c36
-rw-r--r--drivers/video/Kconfig3
2 files changed, 2 insertions, 37 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index a5872d0942ab..d7a16a28c540 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2386,41 +2386,6 @@ static inline unsigned int ata_host_intr (struct ata_port *ap,
}
/**
- * ata_chk_spurious_int - Check for spurious interrupts
- * @ap: port to which command is being issued
- *
- * Examines the DMA status registers and clears
- * unexpected interrupts. Created to work around
- * hardware bug on Intel ICH5, but is applied to all
- * chipsets using the standard irq handler, just for safety.
- * If the bug is not present, this is simply a single
- * PIO or MMIO read addition to the irq handler.
- *
- * LOCKING:
- */
-static inline void ata_chk_spurious_int(struct ata_port *ap) {
- int host_stat;
-
- if (ap->flags & ATA_FLAG_MMIO) {
- void *mmio = (void *) ap->ioaddr.bmdma_addr;
- host_stat = readb(mmio + ATA_DMA_STATUS);
- } else
- host_stat = inb(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
-
- if ((host_stat & (ATA_DMA_INTR | ATA_DMA_ERR | ATA_DMA_ACTIVE)) == ATA_DMA_INTR) {
- if (ap->flags & ATA_FLAG_MMIO) {
- void *mmio = (void *) ap->ioaddr.bmdma_addr;
- writeb(host_stat & ~ATA_DMA_ERR, mmio + ATA_DMA_STATUS);
- } else
- outb(host_stat & ~ATA_DMA_ERR, ap->ioaddr.bmdma_addr + ATA_DMA_STATUS);
-
- DPRINTK("ata%u: Caught spurious interrupt, status 0x%X\n", ap->id, host_stat);
- udelay(1);
- }
-}
-
-
-/**
* ata_interrupt -
* @irq:
* @dev_instance:
@@ -2452,7 +2417,6 @@ irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs)
qc = ata_qc_from_tag(ap, ap->active_tag);
if (qc && ((qc->flags & ATA_QCFLAG_POLL) == 0))
handled += ata_host_intr(ap, qc);
- ata_chk_spurious_int(ap);
}
}
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index cd73949a641a..214c7a9475d9 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -644,7 +644,8 @@ config FB_RADEON
config FB_RADEON_I2C
bool "DDC/I2C for ATI Radeon support"
- depends on FB_RADEON && (I2C_ALGOBIT=FB_RADEON || I2C_ALGOBIT=y)
+ depends on FB_RADEON && I2C
+ select I2C_ALGOBIT
default y
help
Say Y here if you want DDC/I2C support for your Radeon board.