lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2be4ff2f08
android_kernel_xiaomi_sm8350/drivers/ide/legacy
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
..
ali14xx.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
buddha.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
dtc2278.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
falconide.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
gayle.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
ht6560b.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
ide_platform.c ide: add ide_host_add() helper 2008-07-23 19:55:57 +02:00
ide-4drives.c ide: add ide_host_add() helper 2008-07-23 19:55:57 +02:00
ide-cs.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2008-10-13 14:12:40 -07:00
macide.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
Makefile
q40ide.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
qd65xx.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00
qd65xx.h
umc8672.c ide: include <linux/hdreg.h> only when needed 2008-10-10 22:39:27 +02:00