1. 05 May, 2007 1 commit
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart · 98b96173
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
        [AGPGART] sworks-agp: Switch to PCI ref counting APIs
        [AGPGART] Nvidia AGP: Use refcount aware PCI interfaces
        [AGPGART] Fix sparse warning in sgi-agp.c
        [AGPGART] Intel-agp adjustments
        [AGPGART] Move [un]map_page_into_agp into asm/agp.h
        [AGPGART] Add missing calls to global_flush_tlb() to ali-agp
        [AGPGART] prevent probe collision of sis-agp and amd64_agp
      98b96173
  2. 04 May, 2007 9 commits
  3. 01 May, 2007 1 commit
    • Linus Torvalds's avatar
      libata: honour host controllers that want just one host · dc87c398
      Linus Torvalds authored
      The Marvell IDE interface on my machine would hit a BUG_ON() in
      lib/iomem.c because it was calling ata_pci_init_one() specifying just a
      single port on the host, but that would actually end up trying to
      initialize two ports, the second one with bogus information.
      
      This fixes "ata_pci_init_one()" so that it actually passes down the
      n_ports variable that it got from the low-level driver to the host
      allocation routine ("ata_host_alloc_pinfo()"), which results in the ATA
      layer actually having the correct port number information.
      
      And in order to make it all work, I also needed to fix a few places that
      had incorrectly hard-coded the fact that a host always had exactly two
      ports (both ata_pci_init_bmdma() and ata_request_legacy_irqs() would
      just always iterate over both ports).
      Acked-by: default avatarJeff Garzik <jeff@garzik.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      dc87c398
  4. 30 Apr, 2007 29 commits