1
linux/drivers/parport
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
..
BUGS-parport
ChangeLog
daisy.c [PARPORT] Remove unused 'irq' argument from parport irq functions 2007-10-23 19:53:16 -04:00
ieee1284_ops.c parport: fix ieee1284_epp_read_addr 2008-02-08 09:22:36 -08:00
ieee1284.c parport: remove superfluous local variable 2008-07-26 12:00:03 -07:00
Kconfig avr32: don't offer PARPORT_PC 2008-04-19 20:40:10 -04:00
Makefile
multiface.h
parport_amiga.c
parport_atari.c
parport_ax88796.c parport: fix platform driver hotplug/coldplug 2008-07-25 10:53:28 -07:00
parport_cs.c pcmcia: pcmcia_config_loop() improvement by passing vcc 2008-08-23 01:22:52 +02:00
parport_gsc.c drivers: replace remaining __FUNCTION__ occurrences 2008-04-30 08:29:53 -07:00
parport_gsc.h
parport_ip32.c
parport_mfc3.c [PARPORT] Kill useful 'irq' arg from parport_{generic_irq,ieee1284_interrupt} 2007-10-23 19:53:15 -04:00
parport_pc.c parport_pc: add base_hi BAR for oxsemi_840 2008-07-26 12:00:03 -07:00
parport_serial.c parport_serial: netmos 9855 fix 2008-02-06 10:41:08 -08:00
parport_sunbpp.c sparc: Annotate of_device_id arrays with const or __initdata. 2008-08-31 01:23:17 -07:00
probe.c Spelling fixes: lenght->length 2008-02-03 15:42:53 +02:00
procfs.c parport/share.c: proper externs 2008-07-26 12:00:03 -07:00
share.c [PARPORT] Remove unused 'irq' argument from parport irq functions 2007-10-23 19:53:16 -04:00
TODO-parport