leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
febde37119
linux/drivers/ide
History
Linus Torvalds 72558dde73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (36 commits)
  ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup
  scc_pata: kill unused variables
  sgiioc4: kill duplicate ioremap()
  sgiioc4: kill useless address checks
  delkin_cb: add PM support
  ide: remove broken hpt34x driver
  ide-floppy: remove idefloppy_floppy_t typedef
  sgiioc4: remove maskproc() method
  hpt366: cleanup maskproc() method
  ide: mask interrupt in ide_config_drive_speed()
  hpt366: fix compile warning
  ide: remove unused macros from <asm-parisc/ide.h>
  ide: remove M68K_IDE_SWAPW define from <asm-m68k/ide.h>
  ide: remove dead <asm-arm/arch-sa1100/ide.h>
  ide: fix support for IDE PCI controllers using MMIO on frv
  ide-cd: remove stale comment
  ide-cd: small drive type print fix
  ide-cd: debug log enhancements
  ide: add generic ATA/ATAPI disk driver
  ide: allow device drivers to specify per-device type /proc settings
  ...
2008-10-20 13:12:39 -07:00
..
arm ide: make ide_dma_timeout() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n 2008-10-13 21:39:46 +02:00
h8300 ide: remove [ata_]select_t 2008-10-13 21:39:40 +02:00
legacy Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 2008-10-13 14:15:06 -07:00
mips ide: switch to DMA-mapping API part #2 2008-10-13 21:39:47 +02:00
pci scc_pata: kill unused variables 2008-10-17 18:09:17 +02:00
ppc pmac: remove needless pmac_ide_destroy_dmatable() wrapper 2008-10-13 21:39:45 +02:00
ide-acpi.c ide: add device flags 2008-10-13 21:39:36 +02:00
ide-atapi.c ide: remove IDE_AFLAG_NO_DOORLOCKING 2008-10-17 18:09:11 +02:00
ide-cd_ioctl.c ide: remove IDE_AFLAG_NO_DOORLOCKING 2008-10-17 18:09:11 +02:00
ide-cd_verbose.c block: replace sizeof(rq->cmd) with BLK_MAX_CDB 2008-04-29 14:48:55 +02:00
ide-cd.c ide-cd: remove stale comment 2008-10-17 18:09:14 +02:00
ide-cd.h ide-cd: move cdrom_info.dma to ide_drive_t.dma 2008-10-13 21:39:49 +02:00
ide-disk_ioctl.c ide: add generic ATA/ATAPI disk driver 2008-10-17 18:09:14 +02:00
ide-disk_proc.c ide-disk: factor out generic disk handling code to ide-gd.c 2008-10-17 18:09:12 +02:00
ide-disk.c ide: add generic ATA/ATAPI disk driver 2008-10-17 18:09:14 +02:00
ide-disk.h ide: add generic ATA/ATAPI disk driver 2008-10-17 18:09:14 +02:00
ide-dma-sff.c ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup 2008-10-17 18:09:18 +02:00
ide-dma.c ide: move SFF DMA code to ide-dma-sff.c 2008-10-13 21:39:47 +02:00
ide-floppy_ioctl.c ide-floppy: remove idefloppy_floppy_t typedef 2008-10-17 18:09:16 +02:00
ide-floppy_proc.c ide: prepare for merging ide-gd-floppy.c with ide-gd.c 2008-10-17 18:09:13 +02:00
ide-floppy.c ide-floppy: remove idefloppy_floppy_t typedef 2008-10-17 18:09:16 +02:00
ide-floppy.h ide-floppy: remove idefloppy_floppy_t typedef 2008-10-17 18:09:16 +02:00
ide-gd.c ide: add generic ATA/ATAPI disk driver 2008-10-17 18:09:14 +02:00
ide-gd.h ide: add generic ATA/ATAPI disk driver 2008-10-17 18:09:14 +02:00
ide-generic.c ide-generic: remove no longer needed ide_probe_legacy() 2008-10-13 21:39:42 +02:00
ide-io.c block: remove __generic_unplug_device() from exports 2008-10-17 14:03:08 +02:00
ide-ioctls.c ide: add device flags 2008-10-13 21:39:36 +02:00
ide-iops.c ide: mask interrupt in ide_config_drive_speed() 2008-10-17 18:09:15 +02:00
ide-lib.c ide: add device flags 2008-10-13 21:39:36 +02:00
ide-park.c ide: Implement disk shock protection support (v4) 2008-10-13 21:39:50 +02:00
ide-pio-blacklist.c ide: move PIO blacklist to ide-pio-blacklist.c 2008-07-16 20:33:39 +02:00
ide-pnp.c ide: add ide_host_add() helper 2008-07-23 19:55:57 +02:00
ide-probe.c ide: remove IDE_AFLAG_NO_DOORLOCKING 2008-10-17 18:09:11 +02:00
ide-proc.c ide: allow device drivers to specify per-device type /proc settings 2008-10-17 18:09:13 +02:00
ide-scan-pci.c ide: replace remaining __FUNCTION__ occurrences 2008-04-26 22:25:20 +02:00
ide-tape.c ide: allow device drivers to specify per-device type /proc settings 2008-10-17 18:09:13 +02:00
ide-taskfile.c ide: Implement disk shock protection support (v4) 2008-10-13 21:39:50 +02:00
ide-timings.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
ide.c ide: Implement disk shock protection support (v4) 2008-10-13 21:39:50 +02:00
Kconfig ide: remove broken hpt34x driver 2008-10-17 18:09:16 +02:00
Makefile ide: add generic ATA/ATAPI disk driver 2008-10-17 18:09:14 +02:00
setup-pci.c ide: add proper PCI PM support (v2) 2008-10-10 22:39:32 +02:00