summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-03-11Merge commit 'semaphore/semaphore'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt drivers/firewire/fw-device.c
2008-03-11Merge commit 'galak/powerpc-next'Stephen Rothwell
2008-03-11Merge commit 'net/master'Stephen Rothwell
2008-03-11Merge commit 'security-testing/next'Stephen Rothwell
2008-03-11Merge commit 'udf/for_next'Stephen Rothwell
2008-03-11Merge commit 'async_tx/next'Stephen Rothwell
2008-03-11Merge commit '4xx/next'Stephen Rothwell
2008-03-11Revert "ext4: ENOSPC error handling for writing to an uninitialized extent"Stephen Rothwell
This reverts commit dde5f2130096f8469eb1aa1ad250cd2a39fee3f5.
2008-03-11Revert "ext4: zero out small extents when writing to prealloc area."Stephen Rothwell
This reverts commit 1ae53f35fea49a9013353078e019469551d2ad74.
2008-03-11Merge commit 'ext4/next'Stephen Rothwell
2008-03-11Merge commit 'hrt/mm'Stephen Rothwell
2008-03-11Merge commit 'powerpc/powerpc-next'Stephen Rothwell
Conflicts: arch/powerpc/Kconfig
2008-03-11Merge commit 'selinux/for-akpm'Stephen Rothwell
2008-03-11Merge commit 'ocfs2/linux-next'Stephen Rothwell
2008-03-11Merge commit 'tests/master'Stephen Rothwell
Conflicts: lib/Kconfig.debug
2008-03-11Merge commit 'ia64/test'Stephen Rothwell
2008-03-11Merge commit 'scsi/master'Stephen Rothwell
2008-03-11Merge commit 'scsi-rc-fixes/master'Stephen Rothwell
2008-03-11Merge commit 'dlm/next'Stephen Rothwell
2008-03-11Merge commit 'kvm/master'Stephen Rothwell
2008-03-11Merge commit 'ubi/master'Stephen Rothwell
2008-03-11Merge commit 'hwmon/testing'Stephen Rothwell
2008-03-11Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-03-11Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2008-03-11Merge commit 'acpi/test'Stephen Rothwell
2008-03-11Merge commit 'infiniband/for-next'Stephen Rothwell
2008-03-11Merge commit 'xfs/master'Stephen Rothwell
2008-03-11Merge commit 'nfs/linux-next'Stephen Rothwell
2008-03-11Merge branch 'quilt/ide'Stephen Rothwell
Conflicts: Documentation/ide/ide.txt Documentation/kernel-parameters.txt drivers/ide/ide-dma.c drivers/ide/ide.c
2008-03-11Merge commit 'jfs/next'Stephen Rothwell
2008-03-11Merge commit 'sh/master'Stephen Rothwell
2008-03-11Merge commit 's390/features'Stephen Rothwell
2008-03-11Merge commit 'v4l-dvb/stable'Stephen Rothwell
2008-03-11Merge commit 'avr32/avr32-arch'Stephen Rothwell
2008-03-11Merge branch 'quilt/kernel-doc'Stephen Rothwell
2008-03-11Merge branch 'quilt/i2c'Stephen Rothwell
2008-03-11Merge commit 'hid/mm'Stephen Rothwell
2008-03-11ide: remove ->cds field from ide_hwif_tBartlomiej Zolnierkiewicz
* Use hwif->name instead of cds->name in ide_allocate_dma_engine(). * Use pci_name(dev) instead of cds->name in init_dma_pdc202xx(). * Remove no longer needed ->cds field from ide_hwif_t. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11ide: remove ide_dma_iobase()Bartlomiej Zolnierkiewicz
* ide_mapped_mmio_dma() and ide_iomio_dma() are called only by ide_dma_iobase() so inline them there. * ide_dma_iobase() is called only by ide_setup_dma() so inline it there. * Setup hwif->extra_base also if hwif->mmio flag is set. There should be no functional changes casued by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11ide: remove ->extra field from struct ide_port_infoBartlomiej Zolnierkiewicz
Always setup hwif->extra_base in ide_iomio_dma() and remove no longer needed ->extra field from struct ide_port_info. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11ide: replace remaining __FUNCTION__ occurrencesHarvey Harrison
__FUNCTION__ is gcc-specific, use __func__ [bart: fix checkpatch.pl errors in ide-lib.c and ppc/mpc8xx.c while at it] Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11ide-tape: remove idetape_pipeline_active()Borislav Petkov
This function was simply a wrapper for a test_bit() macro so remove it and use the macro instead. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11ide: cleanup setting hwif->mmio flagBartlomiej Zolnierkiewicz
It is no longer needed to set hwif->mmio flag to tell IDE layer to not manage resources so cleanup host drivers that used hwif->mmio flag only for this purpose. Ditto for ide_legacy_init_one(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11ide: remove ide_hwif_request_regions()Bartlomiej Zolnierkiewicz
Remove no longer used ide_hwif_request_regions() and hwif_request_region(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11ide: manage resources for PCI devices in ide_pci_enable()Bartlomiej Zolnierkiewicz
* Reserve PCI BARs 0-3 (0-1 for single port controllers) in ide_pci_enable() and remove ide_hwif_request_regions() call from ide_device_add_all() (also cleanup resource management in scc_pata host driver). * Fix handling of PCI BAR 4 in ide_pci_enable(), then cleanup ide_iomio_dma() (+ init_hwif_trm290() in trm290 host driver) and remove ide_release[_iomio]_dma(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11cmd640: manage I/O resources in driverBartlomiej Zolnierkiewicz
* Tell IDE layer to not manage resources by setting hwif->mmio flag. * Use {request,release}_region() for resources management. * Use driver name for resources management. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11ide: manage I/O resources in ide_legacy_init_one()Bartlomiej Zolnierkiewicz
* Tell IDE layer to not manage resources by setting hwif->mmio flag. * Use {request,release}_region() for resources management. * Set ->name field of 'struct ide_port_info' instances in legacy VLB host drivers and use driver name for resources management. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11ide: add ide_legacy_init_one() helperBartlomiej Zolnierkiewicz
Move the common code for primary/seconary port setup from ide_legacy_device_add() to ide_legacy_init_one(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11ide_arm: manage I/O resources in driverBartlomiej Zolnierkiewicz
* Tell IDE layer to not manage resources by setting hwif->mmio flag. * Use {request,release}_region() for resources management. * Use driver name for resources management. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-03-11ide-4drives: manage I/O resources in driverBartlomiej Zolnierkiewicz
* Tell IDE layer to not manage resources by setting hwif->mmio flag. * Use {request,release}_region() for resources management. * Use driver name for resources management. * Remove no longer needed 'hwif->chipset == ide_4drives' handling from ide_device_add_all(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>