davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2be4ff2f08
kernel-ark/drivers/ide
History
Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: ioctl-internal definitions
  pcmcia: cistpl header cleanup
  pcmcia: remove unused argument to pcmcia_parse_tuple()
  pcmcia: card services header cleanup
  pcmcia: device_id header cleanup
  pcmcia: encapsulate ioaddr_t
  pcmcia: cleanup device driver header file
  pcmcia: cleanup socket services header file
  pcmcia: merge ds_internal.h into cs_internal.h
  pcmcia: cleanup cs_internal.h
  pcmcia: cs_internal.h is internal
  pcmcia: use dev_printk for cs_error()
  pcmcia: remove CS_ error codes alltogether
  pcmcia: deprecate CS_BAD_TUPLE
  pcmcia: deprecate CS_BAD_ARGS
  pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
  pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
  pcmcia: deprecate CS_NO_MORE_ITEMS
  pcmcia: deprecate CS_IN_USE
  pcmcia: deprecate CS_CONFIGURATION_LOCKED
  ...

Fix trivial conflict in drivers/pcmcia/ds.c manually
2008-10-13 14:12:40 -07:00
..
arm ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
h8300 ide: add ide_host_add() helper 2008-07-23 19:55:57 +02:00
legacy Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2008-10-13 14:12:40 -07:00
mips IDE: Fix platform device registration in Swarm IDE driver (v2) 2008-10-05 18:23:28 +02:00
pci ide: add proper PCI PM support (v2) 2008-10-10 22:39:32 +02:00
ppc ide: make drive->id an union (take 2) 2008-10-10 22:39:19 +02:00
ide-acpi.c ide: make drive->id an union (take 2) 2008-10-10 22:39:19 +02:00
ide-atapi.c ide: add ide_do_test_unit_ready() helper 2008-10-10 22:39:39 +02:00
ide-cd_ioctl.c ide: ide-cd_ioctl.c fix sparse integer as NULL pointer warnings 2008-07-23 19:56:02 +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: Remove ide_spin_wait_hwgroup() and use special requests instead 2008-10-10 22:39:40 +02:00
ide-cd.h ide-cd: convert to using the new atapi_flags 2008-07-23 19:56:02 +02:00
ide-disk.c ide: Remove ide_spin_wait_hwgroup() and use special requests instead 2008-10-10 22:39:40 +02:00
ide-dma.c ide: use ATA_* defines instead of *_STAT and *_ERR ones 2008-10-10 22:39:21 +02:00
ide-floppy_ioctl.c ide-floppy: move floppy ioctls handling to ide-floppy_ioctl.c 2008-10-10 22:39:38 +02:00
ide-floppy.c ide: Remove ide_spin_wait_hwgroup() and use special requests instead 2008-10-10 22:39:40 +02:00
ide-floppy.h ide-floppy: move floppy ioctls handling to ide-floppy_ioctl.c 2008-10-10 22:39:38 +02:00
ide-generic.c ide-generic: handle probing of legacy io-ports v5 2008-10-10 22:39:35 +02:00
ide-io.c ide: Remove ide_spin_wait_hwgroup() and use special requests instead 2008-10-10 22:39:40 +02:00
ide-ioctls.c ide: Remove ide_spin_wait_hwgroup() and use special requests instead 2008-10-10 22:39:40 +02:00
ide-iops.c ide: ide_dev_is_sata() -> ata_id_is_sata() 2008-10-10 22:39:30 +02:00
ide-lib.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +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: add proper PCI PM support (v2) 2008-10-10 22:39:32 +02:00
ide-proc.c ide: Remove ide_spin_wait_hwgroup() and use special requests instead 2008-10-10 22:39:40 +02:00
ide-scan-pci.c ide: replace remaining __FUNCTION__ occurrences 2008-04-26 22:25:20 +02:00
ide-tape.c ide: Remove ide_spin_wait_hwgroup() and use special requests instead 2008-10-10 22:39:40 +02:00
ide-taskfile.c ide: move ioctls handling to ide-ioctls.c 2008-10-10 22:39:33 +02:00
ide-timings.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
ide.c ide: Remove ide_spin_wait_hwgroup() and use special requests instead 2008-10-10 22:39:40 +02:00
Kconfig ide: remove CONFIG_IDEDISK_MULTI_MODE 2008-10-10 22:39:26 +02:00
Makefile ide-floppy: move floppy ioctls handling to ide-floppy_ioctl.c 2008-10-10 22:39:38 +02:00
setup-pci.c ide: add proper PCI PM support (v2) 2008-10-10 22:39:32 +02:00